From 6b53157103d462f7ea0b81f9fe77412719ea2260 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 12:12:59 +0000
Subject: 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
---
package/atftp/Makefile | 2 +-
package/base-files/Makefile | 7 ++++---
package/bluez-libs/Makefile | 8 ++++----
package/bluez-utils/Makefile | 4 ++--
package/cgilib/Makefile | 7 +++----
package/cups/Makefile | 4 ++--
package/curl/Makefile | 4 ++--
package/cyrus-sasl/Makefile | 6 +++---
package/deco/Makefile | 2 +-
package/dhcp/Makefile | 2 +-
package/dsniff/Makefile | 2 +-
package/flac/Makefile | 4 ++--
package/freetype/Makefile | 6 +++---
package/fuse/Makefile | 4 ++--
package/gdbserver/Makefile | 2 +-
package/glib/Makefile | 9 ++++-----
package/gmp/Makefile | 8 ++++----
package/gnutls/Makefile | 5 ++---
package/gpsd/Makefile | 4 ++--
package/howl/Makefile | 4 ++--
package/id3lib/Makefile | 4 ++--
package/iperf/Makefile | 2 +-
package/iptables/Makefile | 4 ++--
package/iptraf/Makefile | 4 ++--
package/jpeg/Makefile | 4 ++--
package/less/Makefile | 4 ++--
package/libamsel/Makefile | 6 +++---
package/libao/Makefile | 4 ++--
package/libart/Makefile | 6 +++---
package/libdaemon/Makefile | 4 ++--
package/libdnet/Makefile | 4 ++--
package/libelf/Makefile | 6 ++----
package/libevent/Makefile | 4 ++--
package/libffi-sable/Makefile | 4 ++--
package/libgcrypt/Makefile | 5 ++---
package/libgd/Makefile | 4 ++--
package/libgdbm/Makefile | 8 ++++----
package/libgpg-error/Makefile | 5 ++---
package/libid3tag/Makefile | 10 +++++-----
package/libmad/Makefile | 4 ++--
package/libnet/Makefile | 4 ++--
package/libnids/Makefile | 10 +++++-----
package/libogg/Makefile | 4 ++--
package/libosip2/Makefile | 4 ++--
package/libpcap/Makefile | 8 ++++----
package/libpng/Makefile | 4 ++--
package/libpthread/Makefile | 4 +---
package/libtasn1/Makefile | 5 ++---
package/libtool/Makefile | 8 ++++----
package/libupnp/Makefile | 6 +++---
package/libusb/Makefile | 8 ++++----
package/libvorbis/Makefile | 4 ++--
package/libvorbisidec/Makefile | 4 ++--
package/libxml2/Makefile | 4 ++--
package/libxslt/Makefile | 4 ++--
package/linux-atm/Makefile | 5 ++---
package/lua/Makefile | 6 +++---
package/lzo/Makefile | 6 +++---
package/maradns/Makefile | 2 +-
package/matrixssl/Makefile | 6 +++---
package/mpd/Makefile | 2 +-
package/mtr/Makefile | 2 +-
package/mysql/Makefile | 4 ++--
package/nano/Makefile | 2 +-
package/ncurses/Makefile | 8 ++++----
package/net-snmp/Makefile | 4 ++--
package/netstat-nat/Makefile | 2 +-
package/nvram/Makefile | 2 +-
package/opencdk/Makefile | 6 ++----
package/openldap/Makefile | 4 ++--
package/openssl/Makefile | 6 ++----
package/openvpn/Makefile | 4 ++--
package/palantir/Makefile | 2 +-
package/pcre/Makefile | 4 ++--
package/popt/Makefile | 4 ++--
package/postgresql/Makefile | 6 +++---
package/radvd/Makefile | 4 ++--
package/rarpd/Makefile | 2 +-
package/readline/Makefile | 4 ++--
package/rrdcollect/Makefile | 2 +-
package/rrdtool/Makefile | 6 +++---
package/rrdtool1/Makefile | 4 ++--
package/rrs/Makefile | 4 ++--
package/rsync/Makefile | 2 +-
package/screen/Makefile | 4 ++--
package/speex/Makefile | 6 +++---
package/sqlite/Makefile | 4 ++--
package/sqlite2/Makefile | 4 ++--
package/ssmtp/Makefile | 4 ++--
package/tcp_wrappers/Makefile | 4 ++--
package/tinc/Makefile | 4 ++--
package/uclibc++/Makefile | 2 +-
package/updatedd/Makefile | 2 +-
package/util-linux/Makefile | 2 +-
package/wifidog/Makefile | 4 ++--
package/wireless-tools/Makefile | 2 +-
package/zlib/Makefile | 8 ++++----
97 files changed, 211 insertions(+), 225 deletions(-)
(limited to 'package')
diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 3acd841d1..3a692314c 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 9cca04a73..78e1f0a53 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 17ac5a116..7490fa8c8 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 a31de263c..ab08c22fb 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 3e17975c1..9a0534fe5 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 ef921ed88..8f75ba17a 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 681308f53..02ea0a352 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 272988310..84238db55 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 e1a020b72..855304d45 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 947948e05..8166e794d 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 35dea6f07..484f0c54b 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 281b2c47e..0e18c5f33 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 c99cb72e2..5744970f1 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 d5e3222e5..452a4ab7d 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 4e011dbab..7e5d33ba8 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 cbbd48678..2715d9fcc 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 975c4452d..b2119e386 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 3e8a31ea9..4e7ccb95e 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 56c562d34..2161fb75e 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 9bb7c7ecd..8969f10fc 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 dba50c227..7d2924aec 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 872edd25e..a4816a629 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 968f597ac..e40fa8e7d 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 83d3cac30..04920306e 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 bcd7a65fc..dbd2bd4ad 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 f958ed420..51e0a5e48 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 795787fdf..a14aa0470 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 44d010cc7..2dbe94ac9 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 eb01c7ad4..bbf2ead77 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 e5e58f0a7..e11254581 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 5501b6bd9..bb48d4430 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 02ea765b0..f6fd702c4 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 4b00f1dd2..7d4d56f13 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 8b9a368f9..26bd2d9db 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 4f9077dbe..6a3028797 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 3d5d74578..aedb0af11 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 fa8a3dc02..c6c0f606d 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 48e2b5ff8..6b34bb5e6 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 51e458bc3..42c9e6862 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 977248d08..251f9834a 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 1673c0de1..cb6e29e04 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 8cb773e3e..3748e93e0 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 48414238c..6fe529b81 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 bf7a224f0..65a52831a 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 908c364a1..fa79e7461 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 104331ba7..f6541cb9d 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 a17158dc3..ad8f44e20 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 fd7836c2a..97a7caef4 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 2342fb0b0..ac74a25e9 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 88c48e751..d09f60d64 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 486de904c..55af3d621 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 1054a7fcb..dc7e5e09e 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 6b78e746d..492080b29 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 97845095e..d349caa7d 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 52c42655a..91738fc1c 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 ef91e287d..1cb04b48e 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 95f5fec12..4b062de33 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 81c749b0c..dddc3ce88 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 3d790ee9d..2be8701a5 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 f106c4de8..dcb821452 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 f8c4f14b1..288b62a8e 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 ade9df72f..f49f2ed86 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 b0af5d7e3..055e265cd 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 46132fb3d..5ecad7ec4 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 29dedc224..e433f557e 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 fef44d5ce..a0ffdc930 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 53893ce57..a6fa4e884 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 db8c65d33..3e4c2d3fe 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 05cee55bf..c313c49d2 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 20179b271..382d88190 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 b76f02ef7..f822e9ad5 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 bf0ada2c4..d7ae22eec 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 68eac5f9e..154dadc4e 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 918ef4662..b24d7d8a2 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 87cb45cff..2dec25bbb 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 12e712f50..85fcabe9b 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 9dea426c4..e31264b02 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 f8f6b7543..44effa867 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 c4380ded3..e9c8fdb3f 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 b3be69a98..cc2e19ac4 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 4daedd960..136d4acab 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 7df6210bb..0dc0a47a5 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 e29636170..68eaf4c3a 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 0cad9c7d2..bd0bfab92 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 c4223c428..21873388d 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 57e7ed47c..a79ee02da 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 dea4c56db..f36a004c7 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 e0f87be74..5cb96390f 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 0db7149d6..54235e506 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 cb24ed527..cbd68d4f6 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 c0e653fb2..769be7722 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 0b4c5eaff..53dbbcdcc 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 f55542c02..1279015fb 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 d2cf96ec1..ad5dd19db 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 b0992db1c..f1b29bc02 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 c4767b212..20f457799 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 2d88d51a2..099ac0389 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
--
cgit v1.2.3