topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- rework target environment

master
vanhofen 5 years ago
parent
7f80d1ec36
commit
985d922789
2 changed files with 36 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      make/environment-target.mk
  2. 34
      make/neutrino-plugins.mk

43
make/environment-target.mk
View File

@ -3,30 +3,25 @@
# #
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
BIN = $(TARGET_DIR)/bin SHARE_FLEX = $(TARGET_SHARE_DIR)/tuxbox/neutrino/flex
ETCINITD = $(TARGET_DIR)/etc/init.d SHARE_ICONS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons
SBIN = $(TARGET_DIR)/sbin SHARE_LOGOS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons/logo
SHAREFLEX = $(TARGET_SHARE_DIR)/tuxbox/neutrino/flex SHARE_PLUGINS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/plugins
SHAREICONS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/icons SHARE_THEMES = $(TARGET_SHARE_DIR)/tuxbox/neutrino/themes
SHAREPLUGINS = $(TARGET_SHARE_DIR)/tuxbox/neutrino/plugins SHARE_WEBRADIO = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webradio
SHARETHEMES = $(TARGET_SHARE_DIR)/tuxbox/neutrino/themes SHARE_WEBTV = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webtv
SHAREWEBRADIO = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webradio VAR_CONFIG = $(TARGET_DIR)/var/tuxbox/config
SHAREWEBTV = $(TARGET_SHARE_DIR)/tuxbox/neutrino/webtv VAR_PLUGINS = $(TARGET_DIR)/var/tuxbox/plugins
VARCONFIG = $(TARGET_DIR)/var/tuxbox/config
VARINITD = $(TARGET_DIR)/var/etc/init.d $(SHARE_FLEX) \
VARPLUGINS = $(TARGET_DIR)/var/tuxbox/plugins $(SHARE_ICONS) \
$(SHARE_LOGOS) \
$(ETCINITD) \ $(SHARE_PLUGINS) \
$(SBIN) \ $(SHARE_THEMES) \
$(SHAREFLEX) \ $(SHARE_WEBRADIO) \
$(SHAREICONS) \ $(SHARE_WEBTV) \
$(SHAREPLUGINS) \ $(VAR_CONFIG) \
$(SHARETHEMES) \ $(VAR_PLUGINS) : | $(TARGET_DIR)
$(SHAREWEBRADIO) \
$(SHAREWEBTV) \
$(VARCONFIG) \
$(VARINITD) \
$(VARPLUGINS) : | $(TARGET_DIR)
mkdir -p $(@) mkdir -p $(@)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

34
make/neutrino-plugins.mk
View File

@ -151,22 +151,22 @@ neutrino-plugin-%: $(NP_OBJ_DIR)/config.status
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREICONS) channellogos: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_ICONS)
rm -rf $(SHAREICONS)/logo rm -rf $(SHARE_LOGOS)
mkdir -p $(SHAREICONS)/logo mkdir -p $(SHARE_LOGOS)
$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHAREICONS)/logo $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos/* $(SHARE_LOGOS)
mkdir -p $(SHAREICONS)/logo/events mkdir -p $(SHARE_LOGOS)/events
$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logos-events/* $(SHARE_LOGOS)/events
$(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \ $(CD) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-links; \
./logo-linker.sh logo-links.db $(SHAREICONS)/logo ./logo-linker.sh logo-links.db $(SHARE_LOGOS)
$(TOUCH) $(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS) logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHARE_PLUGINS)
$(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHAREPLUGINS)/ $(INSTALL_EXEC) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.sh $(SHARE_PLUGINS)/
$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHAREPLUGINS)/ $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.cfg $(SHARE_PLUGINS)/
$(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHAREPLUGINS)/ $(INSTALL_DATA) $(SOURCE_DIR)/$(NI-LOGO-STUFF)/logo-addon/*.png $(SHARE_PLUGINS)/
$(TOUCH) $(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -183,17 +183,17 @@ NEUTRINO-MEDIATHEK_TMP = mediathek.$(NEUTRINO-MEDIATHEK_VER)
NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER) NEUTRINO-MEDIATHEK_SOURCE = mediathek.$(NEUTRINO-MEDIATHEK_VER)
NEUTRINO-MEDIATHEK_SITE = https://github.com/neutrino-mediathek NEUTRINO-MEDIATHEK_SITE = https://github.com/neutrino-mediathek
neutrino-mediathek: $(SHAREPLUGINS) | $(TARGET_DIR) neutrino-mediathek: $(SHARE_PLUGINS) | $(TARGET_DIR)
$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
$(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(GET-GIT-SOURCE) $(NEUTRINO-MEDIATHEK_SITE)/$(NEUTRINO-MEDIATHEK_SOURCE) $(ARCHIVE)/$(NEUTRINO-MEDIATHEK_SOURCE)
$(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE) $(CPDIR)/$(NEUTRINO-MEDIATHEK_SOURCE)
$(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \ $(CHDIR)/$(NEUTRINO-MEDIATHEK_TMP); \
$(INSTALL_COPY) plugins/* $(SHAREPLUGINS)/; \ $(INSTALL_COPY) plugins/* $(SHARE_PLUGINS)/; \
$(INSTALL_COPY) share $(TARGET_DIR) $(INSTALL_COPY) share $(TARGET_DIR)
$(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP) $(REMOVE)/$(NEUTRINO-MEDIATHEK_TMP)
# temporarily use beta-version from our board # temporarily use beta-version from our board
rm -rf $(SHAREPLUGINS)/neutrino-mediathek* rm -rf $(SHARE_PLUGINS)/neutrino-mediathek*
$(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHAREPLUGINS)/ $(INSTALL_COPY) $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/plugins/mediathek/* $(SHARE_PLUGINS)/
$(TOUCH) $(TOUCH)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
@ -220,7 +220,7 @@ else ifeq ($(BOXMODEL), $(filter $(BOXMODEL), h7))
LINKS_PATCH += links-input-event2.patch LINKS_PATCH += links-input-event2.patch
endif endif
links: $(LINKS_DEPS) $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR) links: $(LINKS_DEPS) $(ARCHIVE)/$(LINKS_SOURCE) $(SHARE_PLUGINS) | $(TARGET_DIR)
$(REMOVE)/$(LINKS_TMP) $(REMOVE)/$(LINKS_TMP)
$(UNTAR)/$(LINKS_SOURCE) $(UNTAR)/$(LINKS_SOURCE)
$(CHDIR)/$(LINKS_TMP)/intl; \ $(CHDIR)/$(LINKS_TMP)/intl; \
@ -248,7 +248,7 @@ links: $(LINKS_DEPS) $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR)
; \ ; \
$(MAKE); \ $(MAKE); \
$(MAKE) install DESTDIR=$(TARGET_DIR) $(MAKE) install DESTDIR=$(TARGET_DIR)
mv -f $(TARGET_BIN_DIR)/links $(SHAREPLUGINS)/links.so mv -f $(TARGET_BIN_DIR)/links $(SHARE_PLUGINS)/links.so
$(INSTALL_COPY) $(TARGET_FILES)/links/* $(TARGET_DIR)/ $(INSTALL_COPY) $(TARGET_FILES)/links/* $(TARGET_DIR)/
$(REMOVE)/$(LINKS_TMP) $(REMOVE)/$(LINKS_TMP)
$(TOUCH) $(TOUCH)

Write Preview
Loading…
Cancel
Save