X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ef22bf3f6bf7290a6e72d38e8b1370ced38990f1..682bc4982fcc3b5364e7ea3335c3c99d73bb1a61:/openwrt/package/nocatsplash/Makefile

diff --git a/openwrt/package/nocatsplash/Makefile b/openwrt/package/nocatsplash/Makefile
index d5d6b3653..bb9cb4aee 100644
--- a/openwrt/package/nocatsplash/Makefile
+++ b/openwrt/package/nocatsplash/Makefile
@@ -44,16 +44,25 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
 	);
 	touch $(PKG_BUILD_DIR)/.configured
 
+GLIB_CFLAGS :=-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
+
 $(PKG_BUILD_DIR)/src/splashd: $(PKG_BUILD_DIR)/.configured
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC=$(TARGET_CC) \
-		GLIB_CFLAGS="-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include" \
+		GLIB_CFLAGS="$(GLIB_CFLAGS)" \
+		AM_CFLAGS="$(TARGET_CFLAGS) $(GLIB_CFLAGS)" \
 		GLIB_LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
 		LIBS="-L$(STAGING_DIR)/usr/lib -lglib"
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/src/splashd
 	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_IPK_DIR) install
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) \
+		GLIB_CFLAGS="$(GLIB_CFLAGS)" \
+		AM_CFLAGS="$(TARGET_CFLAGS) $(GLIB_CFLAGS)" \
+		GLIB_LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
+		LIBS="-L$(STAGING_DIR)/usr/lib -lglib" \
+		DESTDIR=$(PKG_IPK_DIR) install
 	$(STRIP) $(PKG_IPK_DIR)/usr/sbin/splashd
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)