finish up package makefile
finish up package makefile


git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3786 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/Config.in -> file:b/Config.in
--- a/Config.in
+++ b/Config.in
@@ -18,6 +18,10 @@
 	bool "Select all packages by default"
 	default n
 
+config WGET
+        string
+        default "wget --passive-ftp -nd"
+
 menuconfig BUILDOPTS
 	bool "Build Options" if DEVEL
 
@@ -37,4 +41,7 @@
 source "target/linux/Config.in"
 source ".config.in"
 
+menu "busybox"
+source "package/busybox/config/Config.in"
+endmenu
 

--- a/package/Makefile
+++ b/package/Makefile
@@ -1,12 +1,10 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/.config
+include .pkgdeps
+
 COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
 INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
-
-all: compile
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
-compile: $(COMPILE_PACKAGES)
-install: base-files-install $(INSTALL_PACKAGES)
 
 $(STAMP_DIR) $(TARGET_DIR):
 	mkdir -p $@
@@ -15,9 +13,20 @@
 	$(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 
 %-compile: $(STAMP_DIR) $(TARGET_DIR)
+	@echo "-> make $@"
 	$(MAKE) -C $(patsubst %-compile,%,$@) compile
 
 %-clean: $(STAMP_DIR) $(TARGET_DIR)
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
 
 
+.pkgdeps: $(TOPDIR)/.pkginfo FORCE
+	@$(TOPDIR)/scripts/gen_deps.pl < $< > $@ || rm -f $@
+
+all: compile
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+compile: $(COMPILE_PACKAGES)
+install: base-files-install $(INSTALL_PACKAGES)
+
+
+

--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -11,6 +11,8 @@
 PKG_SOURCE_URL:=@SF/ipsec-tools
 PKG_MD5SUM:=d0242a943c82c0cbf28005966ff35e21
 PKG_CAT:=bzcat
+
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -66,6 +68,10 @@
 	);
 endef
 
+define Build/Compile
+	$(call Build/Compile/Default,install)
+endef
+
 define Package/ipsec-tools/install
 	install -d -m0755 $(1)/etc
 	install -d -m0755 $(1)/usr/lib/

--- a/scripts/gen_deps.pl
+++ b/scripts/gen_deps.pl
@@ -24,17 +24,24 @@
 	};
 }
 
+$line="";
+
 foreach $name (sort {uc($a) cmp uc($b)} keys %pkg) {
+	print "package-\$(CONFIG_PACKAGE_$name) += $pkg{$name}->{src}\n";
+
 	my $hasdeps = 0;
-	$line = "$pkg{$name}->{src}-compile:";
+	my $depline = "";
 	foreach my $dep (@{$pkg{$name}->{depends}}) {
 	        if (defined $pkg{$dep}->{src} && $pkg{$name}->{src} ne $pkg{$dep}->{src}) {
-			$hasdeps = 1;
-			$line .= " $pkg{$dep}->{src}-compile";
+			$depline .= " $pkg{$dep}->{src}-compile";
 		}
 	}
-	if ($hasdeps) {
-		print "$line\n";
+	if ($depline ne "") {
+		$line .= "$pkg{$name}->{src}-compile: $depline\n";
 	}
 }
 
+if ($line ne "") {
+	print "\n$line";
+}
+

comments