remove -L/usr/lib in pcre-config,

[openwrt.git] / package / sdk / Makefile

diff --git a/package/sdk/Makefile b/package/sdk/Makefile
index b42dda4..53208cb 100644 (file)
--- a/package/sdk/Makefile
+++ b/package/sdk/Makefile
@@ -6,36 +6,41 @@ PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
 PKG_RELEASE:=1
 PKG_CPU:=$(shell uname -m)
 
 PKG_RELEASE:=1

-PKG_NAME:=OpenWrt-SDK-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE)
+SDK_NAME:=OpenWrt-SDK-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE)
+IB_NAME:=OpenWrt-ImageBuilder-$(PKG_OS)-$(PKG_CPU)-$(PKG_RELEASE)

 
 

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
+IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)

 
 all: compile
 
 
 all: compile
 

-$(BIN_DIR)/$(PKG_NAME).tar.bz2:
+$(BIN_DIR)/$(SDK_NAME).tar.bz2:

        (cd $(STAGING_DIR); \
                rm -rf info man share; \
                cd usr; \
                rm -rf doc info man share; \
        )
        (cd $(STAGING_DIR); \
                rm -rf info man share; \
                cd usr; \
                rm -rf doc info man share; \
        )

-       rm -rf $(PKG_BUILD_DIR)
-       mkdir -p $(PKG_BUILD_DIR)/dl $(PKG_BUILD_DIR)/examples $(PKG_BUILD_DIR)/package
-       cp -a $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(PKG_BUILD_DIR)/
-       cp -a $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(PKG_BUILD_DIR)/examples
-       cp $(TOPDIR)/rules.mk $(PKG_BUILD_DIR)/
-       cp ./files/Makefile.sdk $(PKG_BUILD_DIR)/Makefile
-       cp ./files/README.SDK $(PKG_BUILD_DIR)/
-       cp ./files/depend.mk $(PKG_BUILD_DIR)/package/
-       egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(PKG_BUILD_DIR)/.config
-       find $(PKG_BUILD_DIR) -name CVS | xargs rm -rf 
+       rm -rf $(SDK_BUILD_DIR)
+       mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/examples $(SDK_BUILD_DIR)/package
+       cp -a $(STAGING_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
+       cp -a $(TOPDIR)/package/strace $(TOPDIR)/package/iproute2 $(SDK_BUILD_DIR)/examples
+       cp $(TOPDIR)/rules.mk $(SDK_BUILD_DIR)/
+       cp ./files/Makefile.sdk $(SDK_BUILD_DIR)/Makefile
+       cp ./files/README.SDK $(SDK_BUILD_DIR)/
+       cp ./files/depend.mk $(SDK_BUILD_DIR)/package/
+       cp $(TOPDIR)/package/rules.mk $(SDK_BUILD_DIR)/package/
+       egrep '^BR2_(ARCH|WGET|STAGING|JLEVEL|LARGEFILE|TARGET_OPT)' $(TOPDIR)/.config > $(SDK_BUILD_DIR)/.config
+       find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf 

        (cd $(BUILD_DIR); \
        (cd $(BUILD_DIR); \

-               tar cfj $@ $(PKG_NAME); \
+               tar cfj $@ $(SDK_NAME); \

        )
 
 source:
 prepare:
        )
 
 source:
 prepare:

-compile: $(BIN_DIR)/$(PKG_NAME).tar.bz2
+compile: $(BIN_DIR)/$(SDK_NAME).tar.bz2
+# FIXME: image builder disabled for now. need to find a way to make it work cleanly with the new kernel structure
+# $(BIN_DIR)/$(IB_NAME).tar.bz2

 install:
 
 clean:
 install:
 
 clean:

-       rm -rf $(PKG_BUILD_DIR)
+       rm -rf $(SDK_BUILD_DIR) $(BIN_DIR)/$(SDK_NAME).tar.bz2 $(BIN_DIR)/$(IB_NAME).tar.bz2