aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-10-22 12:12:59 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-10-22 12:12:59 +0000
commit8b8c9d4d6e70172075340cc98ca0b5a3850a0e97 (patch)
treee48fd90e059253eaa9bc13f166d06e3ecad818ef /package
parent43cc1b7107138cb7cacae51459e05df5bfcbb384 (diff)
downloadmaster-187ad058-8b8c9d4d6e70172075340cc98ca0b5a3850a0e97.tar.gz
master-187ad058-8b8c9d4d6e70172075340cc98ca0b5a3850a0e97.tar.bz2
master-187ad058-8b8c9d4d6e70172075340cc98ca0b5a3850a0e97.zip
lots of small package changes and dependency cleanups for the V= stuff
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2230 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/atftp/Makefile2
-rw-r--r--package/base-files/Makefile7
-rw-r--r--package/bluez-libs/Makefile8
-rw-r--r--package/bluez-utils/Makefile4
-rw-r--r--package/cgilib/Makefile7
-rw-r--r--package/cups/Makefile4
-rw-r--r--package/curl/Makefile4
-rw-r--r--package/cyrus-sasl/Makefile6
-rw-r--r--package/deco/Makefile2
-rw-r--r--package/dhcp/Makefile2
-rw-r--r--package/dsniff/Makefile2
-rw-r--r--package/flac/Makefile4
-rw-r--r--package/freetype/Makefile6
-rw-r--r--package/fuse/Makefile4
-rw-r--r--package/gdbserver/Makefile2
-rw-r--r--package/glib/Makefile9
-rw-r--r--package/gmp/Makefile8
-rw-r--r--package/gnutls/Makefile5
-rw-r--r--package/gpsd/Makefile4
-rw-r--r--package/howl/Makefile4
-rw-r--r--package/id3lib/Makefile4
-rw-r--r--package/iperf/Makefile2
-rw-r--r--package/iptables/Makefile4
-rw-r--r--package/iptraf/Makefile4
-rw-r--r--package/jpeg/Makefile4
-rw-r--r--package/less/Makefile4
-rw-r--r--package/libamsel/Makefile6
-rw-r--r--package/libao/Makefile4
-rw-r--r--package/libart/Makefile6
-rw-r--r--package/libdaemon/Makefile4
-rw-r--r--package/libdnet/Makefile4
-rw-r--r--package/libelf/Makefile6
-rw-r--r--package/libevent/Makefile4
-rw-r--r--package/libffi-sable/Makefile4
-rw-r--r--package/libgcrypt/Makefile5
-rw-r--r--package/libgd/Makefile4
-rw-r--r--package/libgdbm/Makefile8
-rw-r--r--package/libgpg-error/Makefile5
-rw-r--r--package/libid3tag/Makefile10
-rw-r--r--package/libmad/Makefile4
-rw-r--r--package/libnet/Makefile4
-rw-r--r--package/libnids/Makefile10
-rw-r--r--package/libogg/Makefile4
-rw-r--r--package/libosip2/Makefile4
-rw-r--r--package/libpcap/Makefile8
-rw-r--r--package/libpng/Makefile4
-rw-r--r--package/libpthread/Makefile4
-rw-r--r--package/libtasn1/Makefile5
-rw-r--r--package/libtool/Makefile8
-rw-r--r--package/libupnp/Makefile6
-rw-r--r--package/libusb/Makefile8
-rw-r--r--package/libvorbis/Makefile4
-rw-r--r--package/libvorbisidec/Makefile4
-rw-r--r--package/libxml2/Makefile4
-rw-r--r--package/libxslt/Makefile4
-rw-r--r--package/linux-atm/Makefile5
-rw-r--r--package/lua/Makefile6
-rw-r--r--package/lzo/Makefile6
-rw-r--r--package/maradns/Makefile2
-rw-r--r--package/matrixssl/Makefile6
-rw-r--r--package/mpd/Makefile2
-rw-r--r--package/mtr/Makefile2
-rw-r--r--package/mysql/Makefile4
-rw-r--r--package/nano/Makefile2
-rw-r--r--package/ncurses/Makefile8
-rw-r--r--package/net-snmp/Makefile4
-rw-r--r--package/netstat-nat/Makefile2
-rw-r--r--package/nvram/Makefile2
-rw-r--r--package/opencdk/Makefile6
-rw-r--r--package/openldap/Makefile4
-rw-r--r--package/openssl/Makefile6
-rw-r--r--package/openvpn/Makefile4
-rw-r--r--package/palantir/Makefile2
-rw-r--r--package/pcre/Makefile4
-rw-r--r--package/popt/Makefile4
-rw-r--r--package/postgresql/Makefile6
-rw-r--r--package/radvd/Makefile4
-rw-r--r--package/rarpd/Makefile2
-rw-r--r--package/readline/Makefile4
-rw-r--r--package/rrdcollect/Makefile2
-rw-r--r--package/rrdtool/Makefile6
-rw-r--r--package/rrdtool1/Makefile4
-rw-r--r--package/rrs/Makefile4
-rw-r--r--package/rsync/Makefile2
-rw-r--r--package/screen/Makefile4
-rw-r--r--package/speex/Makefile6
-rw-r--r--package/sqlite/Makefile4
-rw-r--r--package/sqlite2/Makefile4
-rw-r--r--package/ssmtp/Makefile4
-rw-r--r--package/tcp_wrappers/Makefile4
-rw-r--r--package/tinc/Makefile4
-rw-r--r--package/uclibc++/Makefile2
-rw-r--r--package/updatedd/Makefile2
-rw-r--r--package/util-linux/Makefile2
-rw-r--r--package/wifidog/Makefile4
-rw-r--r--package/wireless-tools/Makefile2
-rw-r--r--package/zlib/Makefile8
97 files changed, 211 insertions, 225 deletions
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 3acd841d14..3a692314ce 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,ATFTP,atftp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,ATFTPD,atftpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 9cca04a738..78e1f0a534 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -76,9 +76,10 @@ $(IPKG_HOTPLUG):
package-clean:
rm -f $(PACKAGES)
-clean: package-clean
+
+clean-targets: package-clean
prepare:
-compile: $(PACKAGES)
-install: compile
+compile-targets: $(PACKAGES)
+install-targets: compile
mkdir -p $(TARGET_DIR)
$(IPKG) install $(PACKAGES)
diff --git a/package/bluez-libs/Makefile b/package/bluez-libs/Makefile
index 17ac5a1164..7490fa8c8a 100644
--- a/package/bluez-libs/Makefile
+++ b/package/bluez-libs/Makefile
@@ -22,7 +22,7 @@ $(PKG_BUILD_DIR)/.source: $(DL_DIR)/$(PKG_SOURCE)
zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(BLUEZLIBS_DIR)/.source
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
)
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -84,5 +84,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/bluetooth
rm -rf $(STAGING_DIR)/usr/lib/libbluetooth.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/bluez-utils/Makefile b/package/bluez-utils/Makefile
index a31de263c9..ab08c22fb5 100644
--- a/package/bluez-utils/Makefile
+++ b/package/bluez-utils/Makefile
@@ -23,7 +23,7 @@ $(PKG_BUILD_DIR)/.source: $(DL_DIR)/$(PKG_SOURCE)
zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(BLUEZLIBS_DIR)/.source
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
)
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/package/cgilib/Makefile b/package/cgilib/Makefile
index 3e17975c1e..9a0534fe5d 100644
--- a/package/cgilib/Makefile
+++ b/package/cgilib/Makefile
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,CGILIB,cgilib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
OFLAGS="$(TARGET_CFLAGS)" \
@@ -41,11 +41,10 @@ $(STAGING_DIR)/usr/lib/libcgi.so: $(PKG_BUILD_DIR)/.built
touch $@
install-dev: $(STAGING_DIR)/usr/lib/libcgi.so
-
uninstall-dev:
rm -rf \
$(STAGING_DIR)/usr/include/cgi.h \
$(STAGING_DIR)/usr/lib/libcgi.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/cups/Makefile b/package/cups/Makefile
index ef921ed88a..8f75ba17a3 100644
--- a/package/cups/Makefile
+++ b/package/cups/Makefile
@@ -111,6 +111,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/cups \
$(STAGING_DIR)/usr/lib/libcups.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/curl/Makefile b/package/curl/Makefile
index 681308f53b..02ea0a3526 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -122,8 +122,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libcurl.a \
$(STAGING_DIR)/usr/lib/libcurl.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile
index 2729883102..84238db55d 100644
--- a/package/cyrus-sasl/Makefile
+++ b/package/cyrus-sasl/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBSASL2,libsasl2,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -123,5 +123,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/lib/libsasl{2,}.{a,so*}
rm -rf $(STAGING_DIR)/usr/lib/sasl2
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/deco/Makefile b/package/deco/Makefile
index e1a020b721..855304d45d 100644
--- a/package/deco/Makefile
+++ b/package/deco/Makefile
@@ -15,7 +15,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,DECO,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/dhcp/Makefile b/package/dhcp/Makefile
index 947948e054..8166e794d9 100644
--- a/package/dhcp/Makefile
+++ b/package/dhcp/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR) ; \
./configure \
--copts "$(TARGET_CFLAGS)" \
diff --git a/package/dsniff/Makefile b/package/dsniff/Makefile
index 35dea6f077..484f0c54be 100644
--- a/package/dsniff/Makefile
+++ b/package/dsniff/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,DSNIFF,dsniff,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/flac/Makefile b/package/flac/Makefile
index 281b2c47ee..0e18c5f334 100644
--- a/package/flac/Makefile
+++ b/package/flac/Makefile
@@ -52,8 +52,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libFLAC.a \
$(STAGING_DIR)/usr/lib/libFLAC.so \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/freetype/Makefile b/package/freetype/Makefile
index c99cb72e2c..5744970f10 100644
--- a/package/freetype/Makefile
+++ b/package/freetype/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBFREETYPE,libfreetype,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -84,5 +84,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libfreetype.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/fuse/Makefile b/package/fuse/Makefile
index d5e3222e52..452a4ab7dd 100644
--- a/package/fuse/Makefile
+++ b/package/fuse/Makefile
@@ -104,5 +104,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libfuse.so* \
$(STAGING_DIR)/usr/lib/pkgconfig/fuse.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile
index 4e011dbabf..7e5d33ba80 100644
--- a/package/gdbserver/Makefile
+++ b/package/gdbserver/Makefile
@@ -46,7 +46,7 @@ $(PKG_BUILD_DIR)/.configured:
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/package/glib/Makefile b/package/glib/Makefile
index cbbd48678f..2715d9fcc7 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -21,8 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,GLIB1,glib1,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
glib_cv_sizeof_gmutex=24 \
ac_cv_sizeof_char=1 \
@@ -72,7 +71,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -110,5 +109,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/lib/glib
rm -rf $(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/gmp/Makefile b/package/gmp/Makefile
index 975c4452d4..b2119e386d 100644
--- a/package/gmp/Makefile
+++ b/package/gmp/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBGMP,libgmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -78,5 +78,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/gmp* \
$(STAGING_DIR)/usr/lib/libgmp.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 3e8a31ea99..4e7ccb95e0 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -120,9 +120,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
$(STAGING_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 \
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/gpsd/Makefile b/package/gpsd/Makefile
index 56c562d342..2161fb75ed 100644
--- a/package/gpsd/Makefile
+++ b/package/gpsd/Makefile
@@ -85,5 +85,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/libgpsmm.h \
$(STAGING_DIR)/usr/lib/libgps.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/howl/Makefile b/package/howl/Makefile
index 9bb7c7ecdc..8969f10fce 100644
--- a/package/howl/Makefile
+++ b/package/howl/Makefile
@@ -116,5 +116,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/lib{howl,mDNSResponder}.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/howl.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index dba50c227a..7d2924aecc 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -86,5 +86,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libid3.so \
$(STAGING_DIR)/usr/lib/libid3-*.so.* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/iperf/Makefile b/package/iperf/Makefile
index 872edd25e5..a4816a629c 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -15,7 +15,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,IPERF,iperf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 968f597acb..e40fa8e7da 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -84,5 +84,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/libipq.h
rm -rf $(STAGING_DIR)/usr/lib/libipq.a
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/iptraf/Makefile b/package/iptraf/Makefile
index 83d3cac301..04920306ef 100644
--- a/package/iptraf/Makefile
+++ b/package/iptraf/Makefile
@@ -17,10 +17,10 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,IPTRAF,iptraf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR)/src \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/jpeg/Makefile b/package/jpeg/Makefile
index bcd7a65fc5..dbd2bd4ade 100644
--- a/package/jpeg/Makefile
+++ b/package/jpeg/Makefile
@@ -82,6 +82,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/j{config,error,morecfg}.h \
$(STAGING_DIR)/usr/lib/libjpeg.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/less/Makefile b/package/less/Makefile
index f958ed4205..51e0a5e482 100644
--- a/package/less/Makefile
+++ b/package/less/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LESS,less,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="-I$(STAGING_DIR)/usr/include $(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR)
touch $@
diff --git a/package/libamsel/Makefile b/package/libamsel/Makefile
index 795787fdfb..a14aa0470f 100644
--- a/package/libamsel/Makefile
+++ b/package/libamsel/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBAMSEL,libamsel,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -52,6 +52,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/compat \
$(STAGING_DIR)/usr/lib/libamsel.so \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libao/Makefile b/package/libao/Makefile
index 44d010cc78..2dbe94ac95 100644
--- a/package/libao/Makefile
+++ b/package/libao/Makefile
@@ -87,8 +87,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libao.so* \
$(STAGING_DIR)/usr/lib/pkgconfig/ao.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libart/Makefile b/package/libart/Makefile
index eb01c7ad49..bbf2ead77c 100644
--- a/package/libart/Makefile
+++ b/package/libart/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBART,libart,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
@@ -83,5 +83,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libart_lgpl_2.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libart-2.0.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libdaemon/Makefile b/package/libdaemon/Makefile
index e5e58f0a7b..e11254581b 100644
--- a/package/libdaemon/Makefile
+++ b/package/libdaemon/Makefile
@@ -88,8 +88,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libdaemon.so* \
$(STAGING_DIR)/usr/lib/pkgconfig/libdaemon.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libdnet/Makefile b/package/libdnet/Makefile
index 5501b6bd98..bb48d4430d 100644
--- a/package/libdnet/Makefile
+++ b/package/libdnet/Makefile
@@ -91,5 +91,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/dnet \
$(STAGING_DIR)/usr/lib/libdnet.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libelf/Makefile b/package/libelf/Makefile
index 02ea765b0e..f6fd702c49 100644
--- a/package/libelf/Makefile
+++ b/package/libelf/Makefile
@@ -18,8 +18,6 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBELF,libelf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-.NOTPARALLEL:
-
$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
@@ -85,5 +83,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/libelf*
rm -rf $(STAGING_DIR)/usr/lib/libelf.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libevent/Makefile b/package/libevent/Makefile
index 4b00f1dd27..7d4d56f13d 100644
--- a/package/libevent/Makefile
+++ b/package/libevent/Makefile
@@ -79,5 +79,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libevent.{a,so} \
$(STAGING_DIR)/usr/lib/libevent-$(PKG_VERSION).so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libffi-sable/Makefile b/package/libffi-sable/Makefile
index 8b9a368f91..26bd2d9db8 100644
--- a/package/libffi-sable/Makefile
+++ b/package/libffi-sable/Makefile
@@ -80,5 +80,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/ffi{,target}.h \
$(STAGING_DIR)/usr/lib/libffi.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index 4f9077dbea..6a3028797a 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -86,9 +86,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libgcrypt.{a,so*} \
$(STAGING_DIR)/usr/share/aclocal/libgcrypt.m4 \
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 3d5d745785..aedb0af117 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -90,6 +90,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/gd*.h \
$(STAGING_DIR)/usr/lib/libgd.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libgdbm/Makefile b/package/libgdbm/Makefile
index fa8a3dc020..c6c0f606d9 100644
--- a/package/libgdbm/Makefile
+++ b/package/libgdbm/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBGDBM,libgdbm,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -49,7 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -79,5 +79,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/gdbm.h
rm -rf $(STAGING_DIR)/usr/lib/libgdbm.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile
index 48e2b5ff8e..6b34bb5e69 100644
--- a/package/libgpg-error/Makefile
+++ b/package/libgpg-error/Makefile
@@ -87,9 +87,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libgpg-error.{a,so*} \
$(STAGING_DIR)/usr/share/aclocal/gpg-error.m4 \
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/libid3tag/Makefile b/package/libid3tag/Makefile
index 51e458bc3e..42c9e68624 100644
--- a/package/libid3tag/Makefile
+++ b/package/libid3tag/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBID3TAG,libid3tag,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -61,7 +61,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
all install
touch $@
-$(IPKG_LIBID3TAG): $(STAGING_DIR)/usr/lib/libid3tag.so
+$(IPKG_LIBID3TAG):
install -m0755 -d $(IDIR_LIBID3TAG)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(IDIR_LIBID3TAG)/usr/lib/
$(RSTRIP) $(IDIR_LIBID3TAG)
@@ -83,5 +83,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libid3tag.a \
$(STAGING_DIR)/usr/lib/libid3tag.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libmad/Makefile b/package/libmad/Makefile
index 977248d08a..251f9834af 100644
--- a/package/libmad/Makefile
+++ b/package/libmad/Makefile
@@ -94,8 +94,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libmad.a \
$(STAGING_DIR)/usr/lib/libmad.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libnet/Makefile b/package/libnet/Makefile
index 1673c0de1c..cb6e29e04d 100644
--- a/package/libnet/Makefile
+++ b/package/libnet/Makefile
@@ -96,5 +96,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/libnet* \
$(STAGING_DIR)/usr/lib/libnet.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libnids/Makefile b/package/libnids/Makefile
index 8cb773e3e2..3748e93e09 100644
--- a/package/libnids/Makefile
+++ b/package/libnids/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBNIDS,libnids,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -51,7 +51,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -60,7 +60,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
all install
touch $@
-$(IPKG_LIBNIDS): $(STAGING_DIR)/usr/lib/libnids.so
+$(IPKG_LIBNIDS):
install -m0755 -d $(IDIR_LIBNIDS)/usr/lib
cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libnids.so.* $(IDIR_LIBNIDS)/usr/lib/
$(RSTRIP) $(IDIR_LIBNIDS)
@@ -79,5 +79,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/nids.h
rm -rf $(STAGING_DIR)/usr/lib/libnids.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libogg/Makefile b/package/libogg/Makefile
index 48414238cd..6fe529b816 100644
--- a/package/libogg/Makefile
+++ b/package/libogg/Makefile
@@ -87,8 +87,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libogg.so* \
$(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index bf7a224f0c..65a52831af 100644
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -89,5 +89,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile
index 908c364a11..fa79e7461f 100644
--- a/package/libpcap/Makefile
+++ b/package/libpcap/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBPCAP,libpcap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -81,5 +81,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/pcap*
rm -rf $(STAGING_DIR)/usr/lib/libpcap.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 104331ba73..f6541cb9d9 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -85,6 +85,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libpng{,12}.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libpng{,12}.pc
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libpthread/Makefile b/package/libpthread/Makefile
index a17158dc31..ad8f44e20d 100644
--- a/package/libpthread/Makefile
+++ b/package/libpthread/Makefile
@@ -13,8 +13,6 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBPTHREAD,libpthread,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-.NOTPARALLEL:
-
$(PKG_BUILD_DIR)/.prepared:
mkdir -p $(PKG_BUILD_DIR)
touch $@
@@ -25,7 +23,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
touch $@
-$(IPKG_LIBPTHREAD):
+$(IPKG_LIBPTHREAD): $(PKG_BUILD_DIR)/.built
mkdir -p $(IDIR_LIBPTHREAD)/lib
cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/
cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index fd7836c2a2..97a7caef4d 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -94,9 +94,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libtasn1.{a,so*} \
$(STAGING_DIR)/usr/share/aclocal/libtasn1.m4 \
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 2342fb0b0c..ac74a25e9f 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBLTDL,libltdl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
@@ -78,5 +78,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/ltdl.h \
$(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile
index 88c48e7513..d09f60d64a 100644
--- a/package/libupnp/Makefile
+++ b/package/libupnp/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,LIBUPNP,libupnp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)
$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR)/upnp \
$(TARGET_CONFIGURE_OPTS) \
OPT_FLAGS="$(TARGET_CFLAGS)" \
@@ -54,5 +54,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libthreadutil.so \
$(STAGING_DIR)/usr/lib/libupnp.so \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libusb/Makefile b/package/libusb/Makefile
index 486de904c7..55af3d6215 100644
--- a/package/libusb/Makefile
+++ b/package/libusb/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBUSB,libusb,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) -j1 \
@@ -82,5 +82,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/usb.h \
$(STAGING_DIR)/usr/lib/libusb*.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index 1054a7fcbb..dc7e5e09e0 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -95,8 +95,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libvorbis{,enc,file}.so* \
$(STAGING_DIR)/usr/lib/pkgconfig/vorbis{,enc,file}.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index 6b78e746dd..492080b29c 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -82,8 +82,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libvorbisidec.a \
$(STAGING_DIR)/usr/lib/libvorbisidec.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
-$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile
index 97845095ec..d349caa7df 100644
--- a/package/libxml2/Makefile
+++ b/package/libxml2/Makefile
@@ -118,8 +118,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libxml2.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libxml-2.0.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/libxslt/Makefile b/package/libxslt/Makefile
index 52c42655af..91738fc1c8 100644
--- a/package/libxslt/Makefile
+++ b/package/libxslt/Makefile
@@ -98,8 +98,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libxslt.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/libxslt.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
diff --git a/package/linux-atm/Makefile b/package/linux-atm/Makefile
index ef91e287de..1cb04b48e4 100644
--- a/package/linux-atm/Makefile
+++ b/package/linux-atm/Makefile
@@ -87,9 +87,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/atm{,d,sap}.h \
$(STAGING_DIR)/usr/lib/libatm.{a,so*} \
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
$(MAKE) -C $(PKG_BUILD_DIR) clean
diff --git a/package/lua/Makefile b/package/lua/Makefile
index 95f5fec12a..4b062de335 100644
--- a/package/lua/Makefile
+++ b/package/lua/Makefile
@@ -27,7 +27,7 @@ $(eval $(call PKG_template,LUA_EXAMPLES,lua-examples,$(PKG_VERSION)-$(PKG_RELEAS
$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CROSS)gcc" \
LD="$(TARGET_CROSS)ld" \
@@ -96,5 +96,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/lauxlib.h \
$(STAGING_DIR)/usr/lib/liblua{,lib}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/lzo/Makefile b/package/lzo/Makefile
index 81c749b0c0..dddc3ce885 100644
--- a/package/lzo/Makefile
+++ b/package/lzo/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBLZO,liblzo,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -78,5 +78,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/lzo*.h \
$(STAGING_DIR)/usr/lib/liblzo.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/maradns/Makefile b/package/maradns/Makefile
index 3d790ee9d6..2be8701a5e 100644
--- a/package/maradns/Makefile
+++ b/package/maradns/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,MARADNS,maradns,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
./configure \
diff --git a/package/matrixssl/Makefile b/package/matrixssl/Makefile
index f106c4de81..dcb8214529 100644
--- a/package/matrixssl/Makefile
+++ b/package/matrixssl/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,LIBMATRIXSSL,libmatrixssl,$(PKG_VERSION)-$(PKG_RELEAS
$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR)/src \
$(TARGET_CONFIGURE_OPTS) \
DFLAGS="$(TARGET_CFLAGS) -Wall"
@@ -47,5 +47,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/matrixSsl* \
$(STAGING_DIR)/usr/lib/libmatrixssl.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index f8c4f14b1b..288b62a8e6 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -62,7 +62,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,MPD,mpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
diff --git a/package/mtr/Makefile b/package/mtr/Makefile
index ade9df72fe..f49f2ed869 100644
--- a/package/mtr/Makefile
+++ b/package/mtr/Makefile
@@ -17,7 +17,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,MTR,mtr,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status}; \
touch configure.in; \
touch aclocal.m4; \
diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index b0af5d7e3b..055e265cdc 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -126,5 +126,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/mysql \
$(STAGING_DIR)/usr/lib/mysql \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/nano/Makefile b/package/nano/Makefile
index 46132fb3da..5ecad7ec43 100644
--- a/package/nano/Makefile
+++ b/package/nano/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,NANO,nano,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/ncurses/Makefile b/package/ncurses/Makefile
index 29dedc2249..e433f557e3 100644
--- a/package/ncurses/Makefile
+++ b/package/ncurses/Makefile
@@ -25,10 +25,10 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBNCURSES,libncurses,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
@@ -158,6 +158,6 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libcurses.so \
$(STAGING_DIR)/usr/lib/lib{ncurses,panel}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile
index fef44d5ce7..a0ffdc930b 100644
--- a/package/net-snmp/Makefile
+++ b/package/net-snmp/Makefile
@@ -200,5 +200,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/net-snmp \
$(STAGING_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/netstat-nat/Makefile b/package/netstat-nat/Makefile
index 53893ce571..a6fa4e8842 100644
--- a/package/netstat-nat/Makefile
+++ b/package/netstat-nat/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,NETSTAT-NAT,netstat-nat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
diff --git a/package/nvram/Makefile b/package/nvram/Makefile
index db8c65d332..3e4c2d3fe8 100644
--- a/package/nvram/Makefile
+++ b/package/nvram/Makefile
@@ -34,7 +34,7 @@ $(IPKG_NVRAM):
$(IPKG_BUILD) $(IDIR_NVRAM) $(PACKAGE_DIR)
-compile: install-dev
+compile-targets: install-dev
install-dev: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/lib
cp $(PKG_BUILD_DIR)/*.so $(STAGING_DIR)/usr/lib
diff --git a/package/opencdk/Makefile b/package/opencdk/Makefile
index 05cee55bff..c313c49d22 100644
--- a/package/opencdk/Makefile
+++ b/package/opencdk/Makefile
@@ -92,10 +92,8 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/opencdk.h \
$(STAGING_DIR)/usr/lib/libopencdk.{a,so*} \
-compile: install-dev
-
-clean: uninstall-dev
-
+compile-targets: install-dev
+clean-targets: uninstall-dev
mostlyclean:
make -C $(PKG_BUILD_DIR) clean
rm -f $(PKG_BUILD_DIR)/.built
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 20179b2719..382d88190c 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -136,5 +136,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/{lber,ldap}*.h
rm -rf $(STAGING_DIR)/usr/lib/lib{lber,ldap}*.{a,so*}
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/openssl/Makefile b/package/openssl/Makefile
index b76f02ef7e..f822e9ad54 100644
--- a/package/openssl/Makefile
+++ b/package/openssl/Makefile
@@ -24,8 +24,6 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBOPENSSL,libopenssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,OPENSSL_UTIL,openssl-util,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-.NOTPARALLEL:
-
$(PKG_BUILD_DIR)/.configured:
$(SED) 's,/CFLAG=,/CFLAG= $(TARGET_SOFT_FLOAT) ,g' $(PKG_BUILD_DIR)/Configure
(cd $(PKG_BUILD_DIR); \
@@ -94,5 +92,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/openssl \
$(STAGING_DIR)/usr/lib/lib{crypto,ssl}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/openvpn/Makefile b/package/openvpn/Makefile
index bf0ada2c43..d7ae22eec6 100644
--- a/package/openvpn/Makefile
+++ b/package/openvpn/Makefile
@@ -32,7 +32,7 @@ ifneq ($(BR2_PACKAGE_OPENVPN_HTTP),y)
DISABLE_HTTP:=--disable-http
endif
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -71,7 +71,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $(PKG_BUILD_DIR)/.configured
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/package/palantir/Makefile b/package/palantir/Makefile
index 68eac5f9eb..154dadc4ee 100644
--- a/package/palantir/Makefile
+++ b/package/palantir/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,PALANTIR,palantir,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
touch $@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
diff --git a/package/pcre/Makefile b/package/pcre/Makefile
index 918ef4662d..b24d7d8a2a 100644
--- a/package/pcre/Makefile
+++ b/package/pcre/Makefile
@@ -88,5 +88,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/pcre{,posix}.h \
$(STAGING_DIR)/usr/lib/libpcre{,posix}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 87cb45cff1..2dec25bbb6 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -77,5 +77,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/popt.h \
$(STAGING_DIR)/usr/lib/libpopt.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/postgresql/Makefile b/package/postgresql/Makefile
index 12e712f50c..85fcabe9bc 100644
--- a/package/postgresql/Makefile
+++ b/package/postgresql/Makefile
@@ -23,8 +23,8 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBPQ,libpq,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,PGSQL_CLI,pgsql-cli,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured:
# ./configure advertise "--infodir", but does not support it, replaced with "--docdir"
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
@@ -123,5 +123,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/postgresql \
$(STAGING_DIR)/usr/lib/libpq.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/radvd/Makefile b/package/radvd/Makefile
index 9dea426c4e..e31264b028 100644
--- a/package/radvd/Makefile
+++ b/package/radvd/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RADVD,radvd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -49,7 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
radvd_LDADD=""
mkdir -p $(PKG_INSTALL_DIR)
diff --git a/package/rarpd/Makefile b/package/rarpd/Makefile
index f8f6b75439..44effa8676 100644
--- a/package/rarpd/Makefile
+++ b/package/rarpd/Makefile
@@ -23,7 +23,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RARPD,rarpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
diff --git a/package/readline/Makefile b/package/readline/Makefile
index c4380ded36..e9c8fdb3f9 100644
--- a/package/readline/Makefile
+++ b/package/readline/Makefile
@@ -78,5 +78,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/readline \
$(STAGING_DIR)/usr/lib/lib{history,readline}.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/rrdcollect/Makefile b/package/rrdcollect/Makefile
index b3be69a983..cc2e19ac43 100644
--- a/package/rrdcollect/Makefile
+++ b/package/rrdcollect/Makefile
@@ -23,7 +23,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RRDCOLLECT,rrdcollect,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,RRDCOLLECT_EXAMPLE,rrdcollect-example,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -DSOCKET_COMM" \
diff --git a/package/rrdtool/Makefile b/package/rrdtool/Makefile
index 4daedd960f..136d4acaba 100644
--- a/package/rrdtool/Makefile
+++ b/package/rrdtool/Makefile
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,LIBRRD,librrd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,RRDCGI,rrdcgi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,RRDTOOL,rrdtool,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -106,5 +106,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/librrd.a \
$(STAGING_DIR)/usr/lib/librrd.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/rrdtool1/Makefile b/package/rrdtool1/Makefile
index 7df6210bb2..0dc0a47a50 100644
--- a/package/rrdtool1/Makefile
+++ b/package/rrdtool1/Makefile
@@ -101,5 +101,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/librrd.a \
$(STAGING_DIR)/usr/lib/librrd.so* \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/rrs/Makefile b/package/rrs/Makefile
index e29636170a..68eaf4c3ac 100644
--- a/package/rrs/Makefile
+++ b/package/rrs/Makefile
@@ -17,10 +17,10 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RRS,rrs,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,RRS_NOSSL,rrs-nossl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
touch $@
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
ifneq ($(BR2_PACKAGE_RRS),)
$(MAKE) -C $(PKG_BUILD_DIR) \
CC="$(TARGET_CC)" \
diff --git a/package/rsync/Makefile b/package/rsync/Makefile
index 0cad9c7d23..bd0bfab920 100644
--- a/package/rsync/Makefile
+++ b/package/rsync/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,RSYNC,rsync,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/screen/Makefile b/package/screen/Makefile
index c4223c4288..21873388de 100644
--- a/package/screen/Makefile
+++ b/package/screen/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,SCREEN,screen,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
$(foreach flag,rename fchmod fchown strerror lstat _exit utimes vsnprintf getcwd setlocale strftime,ac_cv_func_$(flag)=yes ) \
@@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR)
touch $@
diff --git a/package/speex/Makefile b/package/speex/Makefile
index 57e7ed47cf..a79ee02da4 100644
--- a/package/speex/Makefile
+++ b/package/speex/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,LIBSPEEX,libspeex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
@@ -82,5 +82,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libspeex.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/speex.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/sqlite/Makefile b/package/sqlite/Makefile
index dea4c56dbc..f36a004c71 100644
--- a/package/sqlite/Makefile
+++ b/package/sqlite/Makefile
@@ -94,5 +94,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libsqlite3.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/sqlite2/Makefile b/package/sqlite2/Makefile
index e0f87be74a..5cb96390fa 100644
--- a/package/sqlite2/Makefile
+++ b/package/sqlite2/Makefile
@@ -93,5 +93,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/lib/libsqlite.{a,so*} \
$(STAGING_DIR)/usr/lib/pkgconfig/sqlite.pc \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/ssmtp/Makefile b/package/ssmtp/Makefile
index 0db7149d6e..54235e506f 100644
--- a/package/ssmtp/Makefile
+++ b/package/ssmtp/Makefile
@@ -20,7 +20,7 @@ BR2_PACKAGE_SSMTP=m
$(eval $(call PKG_template,SSMTP,ssmtp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -49,7 +49,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
all
touch $@
diff --git a/package/tcp_wrappers/Makefile b/package/tcp_wrappers/Makefile
index cb24ed5276..cbd68d4f63 100644
--- a/package/tcp_wrappers/Makefile
+++ b/package/tcp_wrappers/Makefile
@@ -60,5 +60,5 @@ uninstall-dev:
$(STAGING_DIR)/usr/include/tcpd.h \
$(STAGING_DIR)/usr/lib/libwrap.{a,so*} \
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
diff --git a/package/tinc/Makefile b/package/tinc/Makefile
index c0e653fb26..769be77226 100644
--- a/package/tinc/Makefile
+++ b/package/tinc/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,TINC,tinc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -51,7 +51,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile
index 0b4c5eaffa..53dbbcdcc9 100644
--- a/package/uclibc++/Makefile
+++ b/package/uclibc++/Makefile
@@ -51,7 +51,7 @@ $(IPKG_UCLIBCXX):
mkdir -p $(PACKAGE_DIR)
$(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR)
-compile: install-dev
+compile-targets: install-dev
install-dev: $(PKG_BUILD_DIR)/.built
$(MAKE) -C $(PKG_BUILD_DIR) \
TOPDIR="$(PKG_BUILD_DIR)/" \
diff --git a/package/updatedd/Makefile b/package/updatedd/Makefile
index f55542c02b..1279015fb1 100644
--- a/package/updatedd/Makefile
+++ b/package/updatedd/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,UPDATEDD,updatedd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile
index d2cf96ec11..ad5dd19dba 100644
--- a/package/util-linux/Makefile
+++ b/package/util-linux/Makefile
@@ -21,7 +21,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,FDISK,fdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
diff --git a/package/wifidog/Makefile b/package/wifidog/Makefile
index b0992db1cf..f1b29bc022 100644
--- a/package/wifidog/Makefile
+++ b/package/wifidog/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,WIFIDOG,wifidog,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
@@ -50,7 +50,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $(PKG_BUILD_DIR)/.configured
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS)
mkdir -p $(PKG_INSTALL_DIR)
diff --git a/package/wireless-tools/Makefile b/package/wireless-tools/Makefile
index c4767b2127..20f4577994 100644
--- a/package/wireless-tools/Makefile
+++ b/package/wireless-tools/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,WIRELESS_TOOLS,wireless-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
touch $@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index 2d88d51a25..099ac03893 100644
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/package/rules.mk
$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
@@ -29,7 +29,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
);
touch $@
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
@@ -60,5 +60,5 @@ uninstall-dev:
rm -rf $(STAGING_DIR)/usr/include/zlib.h
rm -rf $(STAGING_DIR)/usr/lib/libz.*
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev