- plugins: switch to neutrino-plugins Makefile handling

make/ni.mk

@@ -54,7 +54,6 @@ ni-image:
 	$(MAKE) iconv
 	$(MAKE) streamripper
 ifeq ($(BOXSERIES), $(filter $(BOXSERIES), hd2 hd51))
-	make channellogos
 	$(MAKE) less
 	$(MAKE) parted
 	$(MAKE) openvpn

make/plugins.mk

@@ -3,196 +3,100 @@
 #
 # -----------------------------------------------------------------------------
 
-TARGET_DIR ?= $(DESTDIR)
+plugins-all: $(D)/neutrino $(D)/neutrino-plugins \
-
-plugins-all: $(D)/neutrino \
-	getrc \
-	input \
-	logomask \
-	msgbox \
-	tuxcal \
-	tuxcom \
-	tuxmail \
-	tuxwetter \
-	cooliTSclimax \
-	emmrd \
-	FritzCallMonitor \
-	FritzInfoMonitor \
-	FritzInfoMonitor-setup \
-	vinfo \
-	EPGscan \
-	EPGscan-setup \
-	pr-auto-timer \
 	logo-addon \
-	smarthomeinfo \
-	mountpointmanagement \
-	heizoelpreise \
-	epgfilter \
-	netzkino \
-	mtv \
-	autoreboot \
-	dropbox_uploader \
-	userbouquets \
-	add-locale \
-	favorites2bin \
-	LocalTV \
-	webradio \
-	webtv \
 	neutrino-mediathek \
-	openvpn-setup \
-	oscammon \
 	lcd4linux-all \
-	doscam-webif-skin \
+	doscam-webif-skin
-	shellexec
 
 plugins-hd1: # nothing to do
 
-plugins-hd2:
+plugins-hd2 \
+plugins-hd51: \
+	channellogos
   ifneq ($(BOXMODEL), kronos_v2)
 	make links
   endif
 
-plugins-hd51: \
-	links \
-	stb_startup \
-	imgbackup-hd51 \
-	showiframe
-
-# -----------------------------------------------------------------------------
-
-channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
-	rm -rf $(SHAREICONS)/logo
-	mkdir -p $(SHAREICONS)/logo
-	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos/* $(SHAREICONS)/logo
-	mkdir -p $(SHAREICONS)/logo/events
-	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events
-	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-links && \
-		./logo-linker.sh logo-links.db $(SHAREICONS)/logo
-
-# -----------------------------------------------------------------------------
-
-lcd4linux-all: $(D)/lcd4linux | $(TARGET_DIR)
-	cp -a $(IMAGEFILES)/lcd4linux/* $(TARGET_DIR)/
-
-lcd4linux-inactive:
-	$(REMOVE)/SamsungLCD4Linux
-	git clone https://github.com/horsti58/SamsungLCD4Linux $(BUILD_TMP)/SamsungLCD4Linux
-	$(CHDIR)/SamsungLCD4Linux/ni; \
-		install -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \
-		cp -a share/* $(TARGET_DIR)/share
-	$(REMOVE)/SamsungLCD4Linux
-
 # -----------------------------------------------------------------------------
 
-emmrd: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/emmrd
+NP_OBJ_DIR = $(BUILD_TMP)/$(NI_NEUTRINO-PLUGINS)
-$(BIN)/emmrd: $(BIN) $(SHAREICONS) $(VARCONFIG) $(ETCINITD)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/emmrd && \
-	$(TARGET)-g++ -Wall $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(CORTEX-STRINGS) -o $@ emmrd.cpp && \
-	install -m 0755 emmrd.init $(ETCINITD)/emmrd && \
-	install -m 0644 hint_emmrd.png $(SHAREICONS)/
-	cd $(ETCINITD) && \
-		ln -sf emmrd S99emmrd && \
-		ln -sf emmrd K01emmrd
 
-# -----------------------------------------------------------------------------
+NP_DEPS  = ffmpeg
+NP_DEPS += libcurl
+NP_DEPS += libpng
+NP_DEPS += libjpeg
+NP_DEPS += giflib
+NP_DEPS += freetype
 
-FritzCallMonitor: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/FritzCallMonitor
+NP_CONFIGURE_ADDITIONS = \
-$(BIN)/FritzCallMonitor: $(D)/openssl $(D)/libcurl $(BIN) $(VARCONFIG) $(ETCINITD) $(SHAREICONS)
+		--disable-logoupdater \
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzCallMonitor && \
+		--disable-logoview
-	$(TARGET)-gcc -Wall $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		\
-		-lstdc++ -lcrypto -pthread -lcurl \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		connect.cpp \
-		FritzCallMonitor.cpp \
-		\
-		-o $@ && \
-	install -m 0644 FritzCallMonitor.addr $(VARCONFIG)/ && \
-	install -m 0644 FritzCallMonitor.cfg $(VARCONFIG)/ && \
-	install -m 0755 fritzcallmonitor.init $(ETCINITD)/fritzcallmonitor && \
-	install -m 0644 hint_FritzCallMonitor.png $(SHAREICONS)/
-	cd $(ETCINITD) && \
-		ln -sf fritzcallmonitor S99fritzcallmonitor && \
-		ln -sf fritzcallmonitor K01fritzcallmonitor
 
-# -----------------------------------------------------------------------------
+ifneq ($(BOXMODEL), hd51)
+  NP_CONFIGURE_ADDITIONS += \
+		--disable-showiframe \
+		--disable-stb_startup \
+		--disable-imgbackup-hd51
+endif
 
-FritzInfoMonitor: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)/FritzInfoMonitor.so
+$(NP_OBJ_DIR)/config.status: $(NP_DEPS)
-$(LIBPLUGINS)/FritzInfoMonitor.so: $(D)/freetype $(D)/openssl $(D)/libcurl $(LIBPLUGINS)
+	test -d $(NP_OBJ_DIR) || mkdir -p $(NP_OBJ_DIR)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzInfoMonitor && \
+	$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/autogen.sh
-	$(TARGET)-gcc -Wall $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
+	pushd $(NP_OBJ_DIR) && \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		export PKG_CONFIG=$(PKG_CONFIG) && \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
+		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
-		\
+		$(BUILDENV) \
-		-lfreetype -lz -lstdc++ -lcrypto -lcurl \
+		$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/configure \
+			--host=$(TARGET) \
+			--build=$(BUILD) \
+			--prefix= \
+			--enable-maintainer-mode \
+			--enable-silent-rules \
 			\
-		-DHAVE_CONFIG_H \
+			--with-neutrino-source=$(SOURCE_DIR)/$(NI_NEUTRINO) \
+			--with-neutrino-build=$(N_OBJ_DIR) \
 			\
-		connect.cpp \
+			$(NP_CONFIGURE_ADDITIONS) \
-		framebuffer.cpp \
-		FritzInfoMonitor.cpp \
-		icons.cpp \
-		parser.cpp \
-		phonebook.cpp \
-		rc.cpp \
-		submenu.cpp \
 			\
-		-o $@ && \
+			--with-target=cdk \
-	install -m 0644 FritzInfoMonitor.cfg $(LIBPLUGINS)/ && \
+			--with-targetprefix= \
-	install -m 0644 FritzInfoMonitor_hint.png $(LIBPLUGINS)/
+			--with-boxtype=$(BOXTYPE) \
-
+			--with-boxmodel=$(BOXSERIES)
-FritzInfoMonitor-setup: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.lua $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@_hint.png $(LIBPLUGINS)/
 
 # -----------------------------------------------------------------------------
 
-vinfo: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/vinfo
+$(D)/neutrino-plugins: $(NP_OBJ_DIR)/config.status
-$(BIN)/vinfo: $(BIN)
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/vinfo && \
+	$(MAKE) -C $(NP_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
-	$(TARGET)-gcc $(TARGET_CFLAGS) -o $@ vinfo.c md5.c
+	$(MAKE) -C $(NP_OBJ_DIR) install DESTDIR=$(TARGET_DIR)
+	$(TOUCH)
 
 # -----------------------------------------------------------------------------
 
-EPGscan: $(LIBPLUGINS) $(VARCONFIG)
+neutrino-plugins-uninstall:
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.sh $(LIBPLUGINS)/
+	-make -C $(NP_OBJ_DIR) uninstall DESTDIR=$(TARGET_DIR)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@_hint.png $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.conf $(VARCONFIG)/
 
-EPGscan-setup: $(LIBPLUGINS)
+neutrino-plugins-distclean:
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.lua $(LIBPLUGINS)/
+	-make -C $(NP_OBJ_DIR) distclean DESTDIR=$(TARGET_DIR)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@_hint.png $(LIBPLUGINS)/
 
-# -----------------------------------------------------------------------------
+neutrino-plugins-clean: neutrino-plugins-uninstall neutrino-plugins-distclean
+	rm -f $(NP_OBJ_DIR)/config.status
+	rm -f $(D)/neutrino-plugins
 
-pr-auto-timer: $(LIBPLUGINS) $(VARCONFIG)
+neutrino-plugins-clean-all: neutrino-plugins-clean
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/auto-record-cleaner $(LIBPLUGINS)/
+	rm -rf $(NP_OBJ_DIR)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/auto-record-cleaner.conf.template $(VARCONFIG)/auto-record-cleaner.conf
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/auto-record-cleaner.rules.template $(VARCONFIG)/auto-record-cleaner.rules
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer.sh $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer.cfg $(LIBPLUGINS)/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer_hint.png $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer.conf.template $(VARCONFIG)/pr-auto-timer.conf
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/pr-auto-timer.rules.template $(VARCONFIG)/pr-auto-timer.rules
 
 # -----------------------------------------------------------------------------
 
-imgbackup-hd51: $(LIBPLUGINS)
+channellogos: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(SHAREICONS)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.sh $(LIBPLUGINS)/
+	rm -rf $(SHAREICONS)/logo
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/
+	mkdir -p $(SHAREICONS)/logo
-
+	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos/* $(SHAREICONS)/logo
-# -----------------------------------------------------------------------------
+	mkdir -p $(SHAREICONS)/logo/events
-
+	install -m 0644 $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logos-events/* $(SHAREICONS)/logo/events
-autoreboot: $(LIBPLUGINS)
+	cd $(SOURCE_DIR)/$(NI_LOGO-STUFF)/logo-links && \
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.sh $(LIBPLUGINS)/
+		./logo-linker.sh logo-links.db $(SHAREICONS)/logo
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/
 
 # -----------------------------------------------------------------------------
 
@@ -203,11 +107,16 @@ logo-addon: $(SOURCE_DIR)/$(NI_LOGO-STUFF) $(LIBPLUGINS)
 
 # -----------------------------------------------------------------------------
 
-smarthomeinfo: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS) $(VARCONFIG)
+lcd4linux-all: $(D)/lcd4linux | $(TARGET_DIR)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.so $(LIBPLUGINS)/
+	cp -a $(IMAGEFILES)/lcd4linux/* $(TARGET_DIR)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/
+
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@_hint.png $(LIBPLUGINS)/
+lcd4linux-inactive:
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.conf $(VARCONFIG)/
+	$(REMOVE)/SamsungLCD4Linux
+	git clone https://github.com/horsti58/SamsungLCD4Linux $(BUILD_TMP)/SamsungLCD4Linux
+	$(CHDIR)/SamsungLCD4Linux/ni; \
+		install -m 0600 etc/lcd4linux.conf $(TARGET_DIR)/etc; \
+		cp -a share/* $(TARGET_DIR)/share
+	$(REMOVE)/SamsungLCD4Linux
 
 # -----------------------------------------------------------------------------
 
@@ -219,38 +128,6 @@ doscam-webif-skin:
 
 # -----------------------------------------------------------------------------
 
-mountpointmanagement: $(LIBPLUGINS)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.sh $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/$@.cfg $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-heizoelpreise: $(LIBPLUGINS)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.lua $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-epgfilter: $(LIBPLUGINS)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.sri $(LIBPLUGINS)/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.lua $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-dropbox_uploader: $(BIN)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-sh/plugins/$@/*.sh $(BIN)/
-
-# -----------------------------------------------------------------------------
-
-openvpn-setup: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS) $(ETCINITD)
-	cp -a $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@* $(LIBPLUGINS)/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/ovpn.init $(ETCINITD)/ovpn
-
-# -----------------------------------------------------------------------------
-
 neutrino-mediathek: $(LIBPLUGINS)
 	$(REMOVE)/$@
 	git clone https://github.com/neutrino-mediathek/mediathek.git $(BUILD_TMP)/$@
@@ -261,356 +138,6 @@ neutrino-mediathek: $(LIBPLUGINS)
 
 # -----------------------------------------------------------------------------
 
-LocalTV : $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS) $(SHAREWEBTV)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.cfg $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@.lua $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@_hint.png $(LIBPLUGINS)/
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/$@Epg.lua $(SHAREWEBTV)/
-
-# -----------------------------------------------------------------------------
-
-add-locale \
-userbouquets \
-stb_startup \
-netzkino \
-mtv \
-favorites2bin: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/$@/* $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-webradio: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(SHAREWEBRADIO)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/webradio/* $(SHAREWEBRADIO)/
-
-webtv: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(SHAREWEBTV)
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/scripts-lua/plugins/webtv/* $(SHAREWEBTV)/
-
-# -----------------------------------------------------------------------------
-
-getrc: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/getrc
-$(BIN)/getrc: $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/getrc && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		getrc.c \
-		io.c \
-		\
-		-o $@
-
-# -----------------------------------------------------------------------------
-
-input: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/input
-$(BIN)/input: $(D)/freetype $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/input && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lpng \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		fb_display.c \
-		gfx.c \
-		input.c \
-		inputd.c \
-		io.c \
-		png_helper.cpp \
-		pngw.cpp \
-		resize.c \
-		text.c \
-		\
-		-o $@
-
-# -----------------------------------------------------------------------------
-
-logomask: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/logomask $(LIBPLUGINS)/logoset.so $(LIBPLUGINS)/logomask.so
-$(BIN)/logomask: $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		gfx.c \
-		logomask.c \
-		\
-		-o $@ && \
-	install -m 0755 logomask.sh $(BIN)/
- 
-$(LIBPLUGINS)/logoset.so: $(D)/freetype $(LIBPLUGINS)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		gfx.c \
-		io.c \
-		logoset.c \
-		text.c \
-		\
-		-o $@ && \
-	install -m 0644 logoset.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 logoset_hint.png $(LIBPLUGINS)/
-
-$(LIBPLUGINS)/logomask.so: $(LIBPLUGINS) $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		starter_logomask.c \
-		\
-		-o $@ && \
-	install -m 0644 logomask.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 logomask_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-msgbox: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/msgbox
-$(BIN)/msgbox: $(D)/freetype $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/msgbox && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lpng \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		fb_display.c \
-		gfx.c \
-		io.c \
-		msgbox.c \
-		png_helper.cpp \
-		pngw.cpp \
-		resize.c \
-		text.c \
-		txtform.c \
-		\
-		-o $@
-
-# -----------------------------------------------------------------------------
-
-tuxcal: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxcald $(LIBPLUGINS)/tuxcal.so
-$(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINITD) $(VARCONFIG)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/daemon && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lpthread \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		tuxcald.c \
-		\
-		-o $@ && \
-	install -m 0755 tuxcald.init $(ETCINITD)/tuxcald
-	cd $(ETCINITD) && \
-		ln -sf tuxcald S99tuxcald && \
-		ln -sf tuxcald K01tuxcald
-	install -d $(VARCONFIG)/tuxcal
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/tuxcal.conf $(VARCONFIG)/tuxcal/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/tuxcal.notify $(VARCONFIG)/tuxcal/
-
-$(LIBPLUGINS)/tuxcal.so: $(LIBPLUGINS)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz \
-		\
-		tuxcal.c \
-		\
-		-o $@ && \
-	install -m 0644 tuxcal.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 tuxcal_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-tuxcom: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)/tuxcom.so
-$(LIBPLUGINS)/tuxcom.so: $(D)/freetype $(LIBPLUGINS)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcom && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		tuxcom.c \
-		\
-		-o $@ && \
-	install -m 0644 tuxcom.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 tuxcom_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-tuxmail: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxmaild $(LIBPLUGINS)/tuxmail.so
-$(BIN)/tuxmaild: $(D)/freetype $(D)/openssl $(BIN) $(ETCINITD) $(VARCONFIG)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/daemon && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lcrypto -lssl -lpthread \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		tuxmaild.c \
-		\
-		-o $@ && \
-	install -m 0755 tuxmaild.init $(ETCINITD)/tuxmaild
-	cd $(ETCINITD) && \
-		ln -sf tuxmaild S99tuxmaild && \
-		ln -sf tuxmaild K01tuxmaild
-	install -d $(VARCONFIG)/tuxmail
-	install -m 0644 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/tuxmail.conf $(VARCONFIG)/tuxmail/
-	install -m 0755 $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail/tuxmail.onreadmail $(VARCONFIG)/tuxmail/
-
-$(LIBPLUGINS)/tuxmail.so: $(LIBPLUGINS)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz \
-		\
-		-DHAVE_CONFIG_H \
-		\
-		tuxmail.c \
-		\
-		-o $@ && \
-	install -m 0644 tuxmail.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 tuxmail_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-tuxwetter: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)/tuxwetter.so
-$(LIBPLUGINS)/tuxwetter.so: $(D)/freetype $(D)/libcurl $(D)/giflib $(D)/libjpeg $(LIBPLUGINS) $(VARCONFIG)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxwetter && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lcrypto -lssl -lcurl -ljpeg -lpng -lgif -lm \
-		\
-		-DWWEATHER \
-		-DHAVE_CONFIG_H \
-		\
-		fb_display.c \
-		gfx.c \
-		gif.c \
-		gifdecomp.c \
-		http.c \
-		io.c \
-		jpeg.c \
-		parser.c \
-		php.c \
-		png_helper.cpp \
-		pngw.cpp \
-		resize.c \
-		text.c \
-		tuxwetter.c \
-		\
-		-o $@; \
-	mkdir -p $(VARCONFIG)/tuxwetter/ && \
-	install -m 0644 tuxwetter.mcfg $(VARCONFIG)/tuxwetter/ && \
-	install -m 0644 tuxwetter.conf $(VARCONFIG)/tuxwetter/ && \
-	install -m 0644 tuxwetter.png $(VARCONFIG)/tuxwetter/ && \
-	install -m 0644 convert.list $(VARCONFIG)/tuxwetter/ && \
-	install -m 0644 tuxwetter.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 tuxwetter_hint.png $(LIBPLUGINS)/ && \
-	ln -sf /lib/tuxbox/plugins/tuxwetter.so $(BIN)/tuxwetter
-
-# -----------------------------------------------------------------------------
-
-cooliTSclimax: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/cooliTSclimax
-$(BIN)/cooliTSclimax: $(D)/ffmpeg $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/cooliTSclimax && \
-	$(TARGET)-g++ $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-lpthread -lavformat -lavcodec -lavutil \
-		\
-		-D__STDC_CONSTANT_MACROS \
-		\
-		cooliTSclimax.cpp \
-		\
-		-o $@
-
-# -----------------------------------------------------------------------------
-
-oscammon: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(D)/zlib $(D)/freetype $(D)/openssl $(LIBPLUGINS)/oscammon.so
-$(LIBPLUGINS)/oscammon.so: $(LIBPLUGINS) $(VARCONFIG)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/oscammon && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lcrypto \
-		\
-		oscammon.c \
-		\
-		-o $@ && \
-	install -m 0644 oscammon.conf $(VARCONFIG)/ && \
-	install -m 0644 oscammon.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 oscammon_hint.png $(LIBPLUGINS)/
-
-# -----------------------------------------------------------------------------
-
-showiframe: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/showiframe
-$(BIN)/showiframe: $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/showiframe && \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		\
-		showiframe.c \
-		\
-		-o $@ && \
-	install -m 0755 showiframe.sh $(BIN)/
-
-# -----------------------------------------------------------------------------
-
-shellexec: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)/shellexec.so
-$(LIBPLUGINS)/shellexec.so: $(D)/freetype $(LIBPLUGINS) $(SHAREFLEX) $(VARCONFIG) $(BIN)
-	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/shellexec; \
-	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
-		-I$(TARGET_INCLUDE_DIR)/freetype2 \
-		\
-		-lfreetype -lz -lpng \
-		\
-		fb_display.c \
-		gfx.c \
-		io.c \
-		png_helper.cpp \
-		pngw.cpp \
-		resize.c \
-		shellexec.c \
-		text.c \
-		\
-		-o $@ && \
-	install -m 0644 shellexec.conf $(VARCONFIG)/ && \
-	install -m 0644 shellexec.cfg $(LIBPLUGINS)/ && \
-	install -m 0644 shellexec_hint.png $(LIBPLUGINS)/ && \
-	install -m 0644 flex_plugins.conf $(SHAREFLEX)/ && \
-	install -m 0644 flex_user.conf $(SHAREFLEX)/
-	mv -f $(LIBPLUGINS)/shellexec.so  $(LIBPLUGINS)/00_shellexec.so
-	mv -f $(LIBPLUGINS)/shellexec.cfg $(LIBPLUGINS)/00_shellexec.cfg
-	mv -f $(LIBPLUGINS)/shellexec_hint.png $(LIBPLUGINS)/00_shellexec_hint.png
-	ln -sf /lib/tuxbox/plugins/00_shellexec.so $(BIN)/shellexec
-
-# -----------------------------------------------------------------------------
-
 LINKS_PATCH  = links-$(LINKS_VER).patch
 LINKS_PATCH += links-$(LINKS_VER)-ac-prog-cxx.patch
 LINKS_PATCH += links-$(LINKS_VER)-input-$(BOXTYPE).patch