fix dependency order for sstrip

[openwrt.git] / obsolete-buildroot / Makefile

diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index 84afb7b..0b67b15 100644 (file)
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -28,7 +28,7 @@
 #
 #############################################################
 
-SNAPSHOT:=20040705
+SNAPSHOT:=20040807
 
 ARCH:=mipsel
 USE_UCLIBC_SNAPSHOT:=$(SNAPSHOT)
@@ -40,8 +40,6 @@ BUILD_WITH_LARGEFILE:=true
 
 OPTIMIZE_FOR_CPU=$(ARCH)
 
-PUB_DIR:=/var/www/html/testsite/ipkg
-
 # Command used to download source code
 WGET:=wget --passive-ftp
 
@@ -97,9 +95,9 @@ INSTALL_LIBGCJ:=false
 # The list of stuff to build for the target filesystem
 #
 #############################################################
-TARGETS:=host-sed gcc3_3 ipkg-utils openwrt-base openwrt-code.bin
+TARGETS:=host-sed openwrt-code.bin
 
-PACKAGES:=oidentd iproute2 sched-modules wshaper
+PACKAGES:=oidentd iproute2 sched-modules wshaper zlib openssl openssh pppoecd dropbear
 
 #############################################################
 #
@@ -150,7 +148,6 @@ TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
 TARGET_CC=$(TARGET_CROSS)gcc
 STRIP=$(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note
 
-
 HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
        -e 's/sparc.*/sparc/' \
        -e 's/arm.*/arm/g' \
@@ -180,7 +177,6 @@ else
 DISABLE_NLS:=--disable-nls
 endif
 
-
 all:   world
 
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))
@@ -189,12 +185,18 @@ TARGETS_DIRCLEAN:=$(patsubst %,%-dirclean,$(TARGETS))
 
 
 PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
+OPENWRT_IPK_DIR=$(SOURCE_DIR)/openwrt/ipkg
 
+world: $(DL_DIR) $(TARGETS_SOURCE) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS)
+       @echo "ALL DONE."
 
-$(BUILD_DIR)/Packages : $(PACKAGES_IPK)
-       (cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
-
-world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) $(PACKAGES_IPK) $(BUILD_DIR)/Packages
+packages: ipkg-utils $(PACKAGES_IPK)
+       -@mkdir -p $(BASE_DIR)/packages
+       { \
+               cd $(BASE_DIR)/packages; \
+               mv $(BUILD_DIR)/*.ipk .; \
+               $(IPKG_MAKE_INDEX) . > Packages; \
+       }
        @echo "ALL DONE."
 
 .PHONY: all world clean dirclean distclean source $(TARGETS) \
@@ -223,11 +225,9 @@ $(STAGING_DIR):
        ln -fs ../$(REAL_GNU_TARGET_NAME)/include $(STAGING_DIR)/usr/include
 
 
-$(TARGET_DIR): $(DL_DIR)/$(OPENWRT_ROOT_SKEL)
+$(TARGET_DIR):
        rm -rf $(TARGET_DIR)
-       #zcat $(SOURCE_DIR)/skel.tar.gz | tar -C $(BUILD_DIR) -xf -
-       zcat $(DL_DIR)/$(OPENWRT_ROOT_SKEL) | tar -C $(BUILD_DIR) -xf -
-       #cp -a $(SOURCE_DIR)/target_skeleton/* $(TARGET_DIR)/
+       cp -a $(SOURCE_DIR)/openwrt/root/ $(TARGET_DIR)
        -find $(TARGET_DIR) -type d -name CVS -exec rm -rf {} \; > /dev/null 2>&1
 
 source: $(TARGETS_SOURCE)
@@ -239,11 +239,13 @@ source: $(TARGETS_SOURCE)
 #############################################################
 clean:
        rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(IMAGE) \
+               $(BASE_DIR)/packages \
                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
 
 dirclean: $(TARGETS_DIRCLEAN)
        rm -rf $(TARGET_DIR) $(STAGING_DIR) $(IMAGE) \
+               $(BASE_DIR)/packages \
                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
 
@@ -251,17 +253,6 @@ distclean:
        rm -rf $(DL_DIR) $(BUILD_DIR) $(LINUX_KERNEL) $(IMAGE) \
                openwrt-linux.trx openwrt-g-code.bin openwrt-gs-code.bin \
                openwrt-kmodules.tar.bz2
-               
-
-publish:       
-       chmod 644 $(BUILD_DIR)/Packages
-       chmod 644 $(BUILD_DIR)/Packages.filelist
-       chmod 644 $(BUILD_DIR)/*.ipk
-       cp $(BUILD_DIR)/Packages $(PUB_DIR)
-       cp $(BUILD_DIR)/Packages.filelist $(PUB_DIR)
-       cp $(BUILD_DIR)/*.ipk $(PUB_DIR)
-               
-
 
 sourceball: 
        rm -rf $(BUILD_DIR)