diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-03-11 17:57:30 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-03-11 17:57:30 +0000 |
| commit | 64144ed331aaab8aac2875cb01c799e45260d716 (patch) | |
| tree | eb16a242b7601c1ba579e71b581d204913ba9b73 /contrib | |
| parent | 8a898ec19992f9287b5704dfe291084c9a88715b (diff) | |
contrib: fix rebuild triggering by assembling PKG_CONFIG_DEPENDS before including package.mk
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/package/luci/Makefile | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/contrib/package/luci/Makefile b/contrib/package/luci/Makefile index 53aaec115..364175790 100644 --- a/contrib/package/luci/Makefile +++ b/contrib/package/luci/Makefile @@ -39,31 +39,6 @@ ifeq ($(BOARD),brcm-2.4) endif -include $(INCLUDE_DIR)/package.mk - -ifeq ($(USELOCAL),1) - define Build/Prepare - mkdir -p $(PKG_BUILD_DIR) - $(TAR) c -C ../../../ . \ - --exclude=.pc --exclude=.svn --exclude=.git \ - --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ - --exclude=dist | \ - tar x -C $(PKG_BUILD_DIR)/ - endef -endif - -define Build/Configure -endef - -MAKE_FLAGS += \ - MODULES="$(LUCI_SELECTED_MODULES)" \ - LUA_TARGET="$(LUA_TARGET)" \ - LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ - CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ - NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" - - ### Templates ### define Package/luci/install/template $(CP) -a $(PKG_BUILD_DIR)/$(2)/dist/* $(1)/ -R @@ -572,4 +547,30 @@ $(eval $(call collection,light,\ ### Compile ### PKG_CONFIG_DEPENDS=$(patsubst %,CONFIG_PACKAGE_%,$(LUCI_BUILD_PACKAGES)) + +include $(INCLUDE_DIR)/package.mk + +ifeq ($(USELOCAL),1) + define Build/Prepare + mkdir -p $(PKG_BUILD_DIR) + $(TAR) c -C ../../../ . \ + --exclude=.pc --exclude=.svn --exclude=.git \ + --exclude='boa-0*' --exclude='*.o' --exclude='*.so' \ + --exclude=dist | \ + tar x -C $(PKG_BUILD_DIR)/ + endef +endif + +define Build/Configure +endef + +MAKE_FLAGS += \ + MODULES="$(LUCI_SELECTED_MODULES)" \ + LUA_TARGET="$(LUA_TARGET)" \ + LUA_SHLIBS="-llua -lm -ldl -lcrypt" \ + CFLAGS="$(TARGET_CFLAGS) $(LUCI_CFLAGS) -I$(STAGING_DIR)/usr/include" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib" \ + NIXIO_TLS="$(NIXIO_TLS)" OS="Linux" + + $(foreach b,$(LUCI_BUILD_PACKAGES),$(eval $(call BuildPackage,$(b)))) |