Fix mppe packaging from #1742

[openwrt.git] / package / Makefile

diff --git a/package/Makefile b/package/Makefile
index 3cad94a..c3fc01c 100644 (file)
--- a/package/Makefile
+++ b/package/Makefile
@@ -1,85 +1,77 @@
-# Main makefile for the packages
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id$
+

 include $(TOPDIR)/rules.mk
 include $(TOPDIR)/rules.mk

+include $(TOPDIR)/.config
+include $(INCLUDE_DIR)/host.mk
+
+all: compile
+
+include $(TMP_DIR)/.packagedeps
+
+PREREQ_PACKAGES:=$(patsubst %,%-prereq,$(prereq-y) $(prereq-m))
+DOWNLOAD_PACKAGES:=$(patsubst %,%-download,$(package-y) $(package-m))
+COMPILE_PACKAGES:=$(patsubst %,%-compile,$(package-y) $(package-m))
+INSTALL_PACKAGES:=$(patsubst %,%-install,$(package-y))
+
+$(STAMP_DIR) $(TARGET_DIR):
+       mkdir -p $@
+
+ifeq ($(QUIET),1)
+%-compile %-install: FORCE
+       $(MAKE) -C $* $(patsubst $*-%,%,$@) || { $(call MESSAGE, "*** $* $(patsubst $*-%,%,$@) failed"); false; }

 
 

-package-y:=openwrt
-package-$(BR2_PACKAGE_ARPTABLES) += arptables
-package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
-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_GLIB) += glib
-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_NOCATSPLASH) += nocatsplash
-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
+%-prepare %-prereq %-download %-clean: FORCE
+else
+%-prepare %-prereq %-download %-clean %-compile %-install: FORCE
+endif
+       $(MAKE) -C $* $(patsubst $*-%,%,$@)

 
 

-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))
+# .IGNORE: $(COMPILE_PACKAGES) 

 
 

-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
+$(TMP_DIR)/.packagedeps: $(TMP_DIR)/.packageinfo
+       @$(TOPDIR)/scripts/metadata.pl package_mk < $< > $@ || rm -f $@

 
 

-$(patsubst %,%-prepare,$(package-y) $(package-m)): linux-install
+preconfig:
+clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m))
+prereq: $(PREREQ_PACKAGES)
+download: $(DOWNLOAD_PACKAGES)
+compile: $(COMPILE_PACKAGES)

 
 

-%-prepare:
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-       @touch $(STAMP_DIR)/.$@
+install-targets: $(INSTALL_PACKAGES)
+install:
+       rm -rf $(BUILD_DIR)/root
+       $(MAKE) install-targets
+       $(MAKE) preconfig
+       @if [ -d $(TOPDIR)/files ]; then \
+               $(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+       fi
+       @( \
+               cd $(BUILD_DIR)/root; \
+               for script in ./etc/init.d/*; do \
+                       grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
+                       IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+               done || true \
+       )
+       @-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
+       @-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f

 
 

-%-compile: %-prepare 
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-compile,%,$@) compile
-       @touch $(STAMP_DIR)/.$@
+index: $(PACKAGE_DIR)/Packages

 
 

-%-install: %-compile
-       @[ -f $(STAMP_DIR)/.$@ ] || $(MAKE) -C $(patsubst %-install,%,$@) install
-       @touch $(STAMP_DIR)/.$@
+$(PACKAGE_DIR)/Packages: $(PACKAGE_DIR)/*.ipk
+       (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)

 
 

-%-clean:
-       @$(MAKE) -C $(patsubst %-clean,%,$@) clean
-       @rm -f $(STAMP_DIR)/.$(patsubst %-clean,%,$@)-*
+symlinks:
+       ../scripts/feeds.sh $(CONFIG_SOURCE_FEEDS) 

 
 

+ifeq ($(MAKECMDGOALS),compile)
+MAKEFLAGS:=$(MAKEFLAGS) -j$(CONFIG_JLEVEL)
+else
+.NOTPARALLEL:
+endif