move alsa from target/linux/package to package, add compile fix for linux 2.4

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 429741d..adeb238 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,82 +1,31 @@
 # Main makefile for the packages
 include $(TOPDIR)/rules.mk
+include $(TOPDIR)/.config
+include $(TOPDIR)/.pkgdeps
 
-package-y:=openwrt
-package-$(BR2_PACKAGE_ARPTABLES) += arptables
-package-$(BR2_PACKAGE_BRIDGE) += bridge
-package-$(BR2_PACKAGE_BUSYBOX) += busybox
-package-$(BR2_PACKAGE_CHILLISPOT) += chillispot
-package-$(BR2_PACKAGE_CIFSMOUNT) += cifsmount
-package-$(BR2_PACKAGE_CUPS) += cups
-package-$(BR2_PACKAGE_DROPBEAR) += dropbear
-package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq
-package-$(BR2_PACKAGE_EBTABLES) += ebtables
-package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate
-package-$(BR2_PACKAGE_FPING) += fping
-package-$(BR2_PACKAGE_GMP) += gmp
-package-$(BR2_PACKAGE_HASERL) += haserl
-package-$(BR2_PACKAGE_IPTABLES) += iptables
-package-$(BR2_PACKAGE_IPROUTE2) += iproute2
-package-$(BR2_PACKAGE_LCD4LINUX) += lcd4linux
-package-$(BR2_PACKAGE_LIBELF) += libelf
-package-$(BR2_PACKAGE_LOADER) += loader
-package-$(BR2_PACKAGE_LZO) += lzo
-package-$(BR2_PACKAGE_MATRIXSSL) += matrixssl
-package-$(BR2_PACKAGE_MICROPERL) += microperl
-package-$(BR2_PACKAGE_NCURSES) += ncurses
-package-$(BR2_PACKAGE_NFSD) += nfs-server
-package-$(BR2_PACKAGE_OPENSSL) += openssl
-package-$(BR2_PACKAGE_OPENNTPD) += openntpd
-package-$(BR2_PACKAGE_OPENVPN) += openvpn
-package-$(BR2_PACKAGE_PCRE) += pcre
-package-$(BR2_PACKAGE_POPT) += popt
-package-$(BR2_PACKAGE_PORTMAP) += portmap
-package-$(BR2_PACKAGE_PPP) += ppp
-package-$(BR2_PACKAGE_PPTP) += pptp
-package-$(BR2_PACKAGE_PPTPD) += pptpd
-package-$(BR2_PACKAGE_QUAGGA) += quagga
-package-$(BR2_PACKAGE_SER) += ser
-package-$(BR2_PACKAGE_SETSERIAL) += setserial
-package-$(BR2_PACKAGE_STRACE) += strace
-package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
-package-$(BR2_PACKAGE_WOL) += wol
-package-$(BR2_PACKAGE_ZLIB) += zlib
-package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder
-package-$(BR2_PACKAGE_LIBNET) += libnet
-package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql
-package-$(BR2_PACKAGE_LIBPQ) += postgresql
+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
+INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
 
-all: compile install
-clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m)) linux-clean
-compile: $(patsubst %,%-compile,$(package-y) $(package-m))
-install: $(patsubst %,%-install,$(package-y))
+$(STAMP_DIR) $(TARGET_DIR):
+       mkdir -p $@
 
-tcpdump-compile: libpcap-compile
-dropbear-compile: zlib-compile
-openssl-compile: zlib-compile
-openvpn-compile: openssl-compile
-nfs-server-compile: portmap-compile
-portmap-compile: tcp_wrappers-compile
-lcd4linux-compile: ncurses-compile
-libnet-compile: libpcap-compile
-mysql-compile: ncurses-compile zlib-compile
-postgresql-compile: zlib-compile
+%-prepare: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
 
-$(patsubst %,%-prepare,$(package-y) $(package-m)): linux-install
+%-compile: $(STAMP_DIR) $(TARGET_DIR)
+       @echo "-> make $@"
+       $(MAKE) -C $(patsubst %-compile,%,$@) compile
 
-%-prepare:
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-       @touch $(STAMP_DIR)/.$@
+%-clean: $(STAMP_DIR) $(TARGET_DIR)
+       $(MAKE) -C $(patsubst %-clean,%,$@) clean
 
-%-compile: %-prepare 
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-       @touch $(STAMP_DIR)/.$@
 
-%-install: %-compile
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-       @touch $(STAMP_DIR)/.$@
+$(TOPDIR)/.pkgdeps: $(TOPDIR)/.pkginfo
+       @$(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)
 
-%-clean:
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*