From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 4 Apr 2005 13:14:29 +0000 (+0000)
Subject: fix include path for glib in nocatsplash
X-Git-Tag: fast2504n-3.10.28-merged~25392
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;ds=sidebyside;h=217848b1144fca3f4f16812622b517211f0f8a84;p=openwrt.git

fix include path for glib in nocatsplash


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@555 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/openwrt/package/nocatsplash/Makefile b/openwrt/package/nocatsplash/Makefile
index d5d6b36535..af79e67368 100644
--- a/openwrt/package/nocatsplash/Makefile
+++ b/openwrt/package/nocatsplash/Makefile
@@ -44,10 +44,13 @@ $(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"