- neutrino.mk: re-sorting makefile

6 years ago · 2ab69f7911
4 changed files with 128 additions and 83 deletions
--- a/make/image-update.mk
+++ b/make/image-update.mk
@ -53,7 +53,7 @@ u-neutrino-full: neutrino-clean
 	$(MAKE) u-init
 	echo "killall start_neutrino neutrino; sleep 5"	>> $(PREINSTALL_SH)
 	echo "sync; /bin/busybox reboot"		>> $(POSTINSTALL_SH)
-	$(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR)
+	$(MAKE) neutrino N_INST_DIR=$(UPDATE_INST_DIR)
 	install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino
 ifneq ($(DEBUG), yes)
 	find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET)-strip || true
--- a/make/images.mk
+++ b/make/images.mk
@ -213,7 +213,6 @@ flash-image-arm-multi:

 PHONY += devtable
 PHONY += devtable-remove
-PHONY += images
 PHONY += flash-image-coolstream
 PHONY += check-image-size
 PHONY += flash-image-arm
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@ -1,16 +1,28 @@
 #
-# makefile to build Neutrino
+# makefile to build libstb-hal and neutrino
 #
 # -----------------------------------------------------------------------------

-YOUTUBE_DEV_KEY ?= AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM
-OMDB_API_KEY ?= 20711f9e
-TMDB_DEV_KEY ?= 7270f1b571c4ecbb5b204ddb7f8939b1
-SHOUTCAST_DEV_KEY ?= fa1669MuiRPorUBw
+N_INST_DIR ?= $(TARGET_DIR)
+N_OBJ_DIR = $(BUILD_TMP)/$(NI_NEUTRINO)

-N_DEPS = libcurl freetype libjpeg giflib ffmpeg openthreads openssl libdvbsi ntp libsigc++ luaposix pugixml libfribidi zlib
+# -----------------------------------------------------------------------------

-LH_DEPS = ffmpeg openthreads
+N_DEPS  =
+N_DEPS += ffmpeg
+N_DEPS += freetype
+N_DEPS += giflib
+N_DEPS += libcurl
+N_DEPS += libdvbsi
+N_DEPS += libfribidi
+N_DEPS += libjpeg
+N_DEPS += libsigc++
+N_DEPS += luaposix
+N_DEPS += ntp
+N_DEPS += openssl
+N_DEPS += openthreads
+N_DEPS += pugixml
+N_DEPS += zlib

 ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes)
  N_DEPS += libcoolstream
@ -20,15 +32,13 @@ ifeq ($(USE_LIBSTB-HAL), yes)
  N_DEPS += libstb-hal
 endif

-USE_GSTREAMER = no
-ifeq ($(BOXSERIES), hd51)
-  ifeq ($(USE_GSTREAMER), yes)
-	LH_DEPS += gst_plugins_dvbmediasink
-  endif
-endif
+# uncomment next lines to build neutrino without --enable-ffmpegdec
+#N_DEPS += libFLAC
+#N_DEPS += libid3tag
+#N_DEPS += libmad
+#N_DEPS += libvorbisidec

-# uncomment next line to build neutrino without --enable-ffmpegdec
-#N_DEPS += libvorbisidec libid3tag libmad libFLAC
+# -----------------------------------------------------------------------------

 N_CFLAGS = -Wall -W -Wshadow -D__STDC_CONSTANT_MACROS -DENABLE_FREESATEPG
 ifeq ($(BOXSERIES), hd1)
@ -53,6 +63,8 @@ else
  N_CFLAGS += $(TARGET_CFLAGS)
 endif

+# -----------------------------------------------------------------------------
+
 N_LDFLAGS = -lcrypto -ldl -lz $(CORTEX-STRINGS) -L$(TARGET_LIB_DIR)
 ifeq ($(DEBUG), yes)
  N_LDFLAGS += -Wl,-rpath-link,$(TARGET_LIB_DIR)
@ -60,6 +72,8 @@ else
  N_LDFLAGS += -Wl,-O1 -Wl,-rpath-link,$(TARGET_LIB_DIR) $(TARGET_EXTRA_LDFLAGS)
 endif

+# -----------------------------------------------------------------------------
+
 N_CONFIGURE_DEBUG =
 ifeq ($(HAS_LIBCS), yes)
  ifeq ($(DEBUG), yes)
@ -69,19 +83,32 @@ ifeq ($(HAS_LIBCS), yes)
  endif
 endif

+# -----------------------------------------------------------------------------
+
 N_CONFIGURE_LIBSTB-HAL =
 ifeq ($(USE_LIBSTB-HAL), yes)
  N_CONFIGURE_LIBSTB-HAL += \
-		--with-stb-hal-includes=$(LH_OBJDIR)/include \
-		--with-stb-hal-build=$(LH_OBJDIR)
+		--with-stb-hal-includes=$(LH_OBJ_DIR)/include \
+		--with-stb-hal-build=$(LH_OBJ_DIR)
 endif

+# -----------------------------------------------------------------------------
+
 N_CONFIGURE_ADDITIONS =
 ifeq ($(BOXSERIES), hd51)
  N_CONFIGURE_ADDITIONS += \
 		--enable-reschange
 endif

+# -----------------------------------------------------------------------------
+
+N_OMDB_API_KEY ?= 20711f9e
+N_SHOUTCAST_DEV_KEY ?= fa1669MuiRPorUBw
+N_TMDB_DEV_KEY ?= 7270f1b571c4ecbb5b204ddb7f8939b1
+N_YOUTUBE_DEV_KEY ?= AIzaSyBLdZe7M3rpNMZqSj-3IEvjbb2hATWJIdM
+
+# -----------------------------------------------------------------------------
+
 N_BUILDENV = \
 	CC=$(TARGET)-gcc \
 	CXX=$(TARGET)-g++ \
@ -102,15 +129,12 @@ N_BUILDENV = \

 # -----------------------------------------------------------------------------

-N_OBJDIR = $(BUILD_TMP)/$(NI_NEUTRINO)
-LH_OBJDIR = $(BUILD_TMP)/$(NI_LIBSTB-HAL-NEXT)
-
-$(N_OBJDIR)/config.status: $(N_DEPS)
-	test -d $(N_OBJDIR) || mkdir -p $(N_OBJDIR)
+$(N_OBJ_DIR)/config.status: $(N_DEPS)
+	test -d $(N_OBJ_DIR) || mkdir -p $(N_OBJ_DIR)
 	cd $(SOURCE_DIR)/$(NI_NEUTRINO) && \
 		git checkout $(NI_NEUTRINO_BRANCH)
 	$(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh
-	pushd $(N_OBJDIR) && \
+	pushd $(N_OBJ_DIR) && \
 		export PKG_CONFIG=$(PKG_CONFIG) && \
 		export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
 		$(N_BUILDENV) \
@ -132,10 +156,10 @@ $(N_OBJDIR)/config.status: $(N_DEPS)
 			--enable-pip \
 			--enable-pugixml \
 			\
-			--with-youtube-dev-key="$(YOUTUBE_DEV_KEY)" \
-			--with-omdb-api-key="$(OMDB_API_KEY)" \
-			--with-tmdb-dev-key="$(TMDB_DEV_KEY)" \
-			--with-shoutcast-dev-key="$(SHOUTCAST_DEV_KEY)" \
+			--with-omdb-api-key="$(N_OMDB_API_KEY)" \
+			--with-shoutcast-dev-key="$(N_SHOUTCAST_DEV_KEY)" \
+			--with-tmdb-dev-key="$(N_TMDB_DEV_KEY)" \
+			--with-youtube-dev-key="$(N_YOUTUBE_DEV_KEY)" \
 			\
 			$(N_CONFIGURE_LIBSTB-HAL) \
 			--with-tremor \
@ -144,6 +168,33 @@ $(N_OBJDIR)/config.status: $(N_DEPS)
 			--with-boxtype=$(BOXTYPE) \
 			--with-boxmodel=$(BOXSERIES)

+# -----------------------------------------------------------------------------
+
+$(D)/neutrino: $(N_OBJ_DIR)/config.status
+	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
+	$(MAKE) -C $(N_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(N_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
+	$(TOUCH)
+
+# -----------------------------------------------------------------------------
+
+LH_OBJ_DIR = $(BUILD_TMP)/$(NI_LIBSTB-HAL-NEXT)
+
+# -----------------------------------------------------------------------------
+
+LH_DEPS  =
+LH_DEPS += ffmpeg
+LH_DEPS += openthreads
+
+USE_GSTREAMER = no
+ifeq ($(BOXSERIES), hd51)
+  ifeq ($(USE_GSTREAMER), yes)
+    LH_DEPS += gst_plugins_dvbmediasink
+  endif
+endif
+
+# -----------------------------------------------------------------------------
+
 LH_CONFIGURE_GSTREAMER =
 ifeq ($(BOXSERIES), hd51)
  ifeq ($(USE_GSTREAMER), yes)
@ -152,10 +203,12 @@ ifeq ($(BOXSERIES), hd51)
  endif
 endif

-$(LH_OBJDIR)/config.status: $(LH_DEPS)
-	rm -rf $(LH_OBJDIR)
+# -----------------------------------------------------------------------------
+
+$(LH_OBJ_DIR)/config.status: $(LH_DEPS)
+	rm -rf $(LH_OBJ_DIR)
 	tar -C $(SOURCE_DIR) -cp $(NI_LIBSTB-HAL-NEXT) --exclude-vcs | tar -C $(BUILD_TMP) -x
-	pushd $(LH_OBJDIR) && \
+	pushd $(LH_OBJ_DIR) && \
 		./autogen.sh && \
 		\
 		export PKG_CONFIG=$(PKG_CONFIG) && \
@ -177,17 +230,10 @@ $(LH_OBJDIR)/config.status: $(LH_DEPS)

 # -----------------------------------------------------------------------------

-NEUTRINO_INST_DIR ?= $(TARGET_DIR)
-$(D)/neutrino: $(N_OBJDIR)/config.status
-	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJDIR) all     DESTDIR=$(TARGET_DIR)
-	$(MAKE) -C $(N_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
-	$(TOUCH)
-
-$(D)/libstb-hal: $(LH_OBJDIR)/config.status
+$(D)/libstb-hal: $(LH_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(LH_OBJDIR) all     DESTDIR=$(TARGET_DIR)
-	$(MAKE) -C $(LH_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR)
+	$(MAKE) -C $(LH_OBJ_DIR) all     DESTDIR=$(TARGET_DIR)
+	$(MAKE) -C $(LH_OBJ_DIR) install DESTDIR=$(N_INST_DIR)
 	$(REWRITE_LIBTOOL)/libstb-hal.la
 	$(TOUCH)

@ -197,10 +243,10 @@ neutrino-bin:
 ifeq ($(CLEAN), yes)
 	$(MAKE) neutrino-clean
 endif
-	$(MAKE) $(N_OBJDIR)/config.status
+	$(MAKE) $(N_OBJ_DIR)/config.status
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
-	$(MAKE) -C $(N_OBJDIR) all DESTDIR=$(TARGET_DIR)
-	install -D -m 0755 $(N_OBJDIR)/src/neutrino $(TARGET_DIR)/bin/neutrino
+	$(MAKE) -C $(N_OBJ_DIR) all DESTDIR=$(TARGET_DIR)
+	install -D -m 0755 $(N_OBJ_DIR)/src/neutrino $(TARGET_DIR)/bin/neutrino
 ifneq ($(DEBUG), yes)
 	$(TARGET)-strip $(TARGET_DIR)/bin/neutrino
 endif
@ -209,21 +255,21 @@ endif
 # -----------------------------------------------------------------------------

 neutrino-clean:
-	-make -C $(N_OBJDIR) uninstall
-	-make -C $(N_OBJDIR) distclean
-	rm -f $(N_OBJDIR)/config.status
+	-make -C $(N_OBJ_DIR) uninstall
+	-make -C $(N_OBJ_DIR) distclean
+	rm -f $(N_OBJ_DIR)/config.status
 	rm -f $(D)/neutrino

 neutrino-clean-all: neutrino-clean
-	rm -rf $(N_OBJDIR)
+	rm -rf $(N_OBJ_DIR)

 libstb-hal-clean:
-	-make -C $(LH_OBJDIR) clean
-	rm -f $(LH_OBJDIR)/config.status
+	-make -C $(LH_OBJ_DIR) clean
+	rm -f $(LH_OBJ_DIR)/config.status
 	rm -f $(D)/libstb-hal

 libstb-hal-clean-all: libstb-hal-clean
-	rm -rf $(LH_OBJDIR)
+	rm -rf $(LH_OBJ_DIR)

 # -----------------------------------------------------------------------------

--- a/make/plugins.mk
+++ b/make/plugins.mk
@ -109,7 +109,7 @@ FritzInfoMonitor: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(LIBPLUGINS)/FritzInfoMo
 $(LIBPLUGINS)/FritzInfoMonitor.so: $(D)/freetype $(D)/openssl $(D)/libcurl $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/FritzInfoMonitor && \
 	$(TARGET)-gcc -Wall $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lstdc++ -lcrypto -lcurl \
@ -258,7 +258,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		\
 		getrc.c \
 		io.c \
@ -271,7 +271,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \
@ -294,7 +294,7 @@ logomask: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/logomask $(LIBPLUGINS)/log
 $(BIN)/logomask: $(BIN)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		\
 		gfx.c \
 		logomask.c \
@ -305,7 +305,7 @@ $(BIN)/logomask: $(BIN)
 $(LIBPLUGINS)/logoset.so: $(D)/freetype $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
@ -322,7 +322,7 @@ $(LIBPLUGINS)/logoset.so: $(D)/freetype $(LIBPLUGINS)
 $(LIBPLUGINS)/logomask.so: $(LIBPLUGINS) $(BIN)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/logomask && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		\
 		starter_logomask.c \
 		\
@ -336,7 +336,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \
@ -359,7 +359,7 @@ tuxcal: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxcald $(LIBPLUGINS)/tuxcal
 $(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINITD) $(VARCONFIG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal/daemon && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpthread \
@ -378,7 +378,7 @@ $(BIN)/tuxcald: $(D)/freetype $(BIN) $(ETCINITD) $(VARCONFIG)
 $(LIBPLUGINS)/tuxcal.so: $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxcal && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
@ -395,7 +395,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
@ -412,7 +412,7 @@ tuxmail: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(BIN)/tuxmaild $(LIBPLUGINS)/tuxm
 $(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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto -lssl -lpthread \
@ -431,7 +431,7 @@ $(BIN)/tuxmaild: $(D)/freetype $(D)/openssl $(BIN) $(ETCINITD) $(VARCONFIG)
 $(LIBPLUGINS)/tuxmail.so: $(LIBPLUGINS)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/tuxmail && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz \
@ -448,7 +448,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto -lssl -lcurl -ljpeg -lpng -lgif \
@ -502,7 +502,7 @@ oscammon: $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS) $(D)/zlib $(D)/freetype $(D)/open
 $(LIBPLUGINS)/oscammon.so: $(LIBPLUGINS) $(VARCONFIG)
 	pushd $(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/oscammon && \
 	$(TARGET)-gcc $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
-		-I$(N_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lcrypto \
@ -532,7 +532,7 @@ 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_OBJDIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
+		-I$(N_OBJ_DIR) -I$(SOURCE_DIR)/$(NI_NEUTRINO-PLUGINS)/include \
 		-I$(TARGET_INCLUDE_DIR)/freetype2 \
 		\
 		-lfreetype -lz -lpng \