From: Felix Fietkau Date: Sat, 22 Oct 2005 12:12:59 +0000 (+0000) Subject: lots of small package changes and dependency cleanups for the V= stuff X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b758a5dc3bc19877e9c3eefc12ce04d7041334f;p=librecmc%2Flibrecmc.git lots of small package changes and dependency cleanups for the V= stuff SVN-Revision: 2230 --- diff --git a/openwrt/package/atftp/Makefile b/openwrt/package/atftp/Makefile index 3acd841d14..3a692314ce 100644 --- a/openwrt/package/atftp/Makefile +++ b/openwrt/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/openwrt/package/base-files/Makefile b/openwrt/package/base-files/Makefile index 9cca04a738..78e1f0a534 100644 --- a/openwrt/package/base-files/Makefile +++ b/openwrt/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/openwrt/package/bluez-libs/Makefile b/openwrt/package/bluez-libs/Makefile index 17ac5a1164..7490fa8c8a 100644 --- a/openwrt/package/bluez-libs/Makefile +++ b/openwrt/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/openwrt/package/bluez-utils/Makefile b/openwrt/package/bluez-utils/Makefile index a31de263c9..ab08c22fb5 100644 --- a/openwrt/package/bluez-utils/Makefile +++ b/openwrt/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/openwrt/package/cgilib/Makefile b/openwrt/package/cgilib/Makefile index 3e17975c1e..9a0534fe5d 100644 --- a/openwrt/package/cgilib/Makefile +++ b/openwrt/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/openwrt/package/cups/Makefile b/openwrt/package/cups/Makefile index ef921ed88a..8f75ba17a3 100644 --- a/openwrt/package/cups/Makefile +++ b/openwrt/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/openwrt/package/curl/Makefile b/openwrt/package/curl/Makefile index 681308f53b..02ea0a3526 100644 --- a/openwrt/package/curl/Makefile +++ b/openwrt/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/openwrt/package/cyrus-sasl/Makefile b/openwrt/package/cyrus-sasl/Makefile index 2729883102..84238db55d 100644 --- a/openwrt/package/cyrus-sasl/Makefile +++ b/openwrt/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/openwrt/package/deco/Makefile b/openwrt/package/deco/Makefile index e1a020b721..855304d45d 100644 --- a/openwrt/package/deco/Makefile +++ b/openwrt/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/openwrt/package/dhcp/Makefile b/openwrt/package/dhcp/Makefile index 947948e054..8166e794d9 100644 --- a/openwrt/package/dhcp/Makefile +++ b/openwrt/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/openwrt/package/dsniff/Makefile b/openwrt/package/dsniff/Makefile index 35dea6f077..484f0c54be 100644 --- a/openwrt/package/dsniff/Makefile +++ b/openwrt/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/openwrt/package/flac/Makefile b/openwrt/package/flac/Makefile index 281b2c47ee..0e18c5f334 100644 --- a/openwrt/package/flac/Makefile +++ b/openwrt/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/openwrt/package/freetype/Makefile b/openwrt/package/freetype/Makefile index c99cb72e2c..5744970f10 100644 --- a/openwrt/package/freetype/Makefile +++ b/openwrt/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/openwrt/package/fuse/Makefile b/openwrt/package/fuse/Makefile index d5e3222e52..452a4ab7dd 100644 --- a/openwrt/package/fuse/Makefile +++ b/openwrt/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/openwrt/package/gdbserver/Makefile b/openwrt/package/gdbserver/Makefile index 4e011dbabf..7e5d33ba80 100644 --- a/openwrt/package/gdbserver/Makefile +++ b/openwrt/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/openwrt/package/glib/Makefile b/openwrt/package/glib/Makefile index cbbd48678f..2715d9fcc7 100644 --- a/openwrt/package/glib/Makefile +++ b/openwrt/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/openwrt/package/gmp/Makefile b/openwrt/package/gmp/Makefile index 975c4452d4..b2119e386d 100644 --- a/openwrt/package/gmp/Makefile +++ b/openwrt/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/openwrt/package/gnutls/Makefile b/openwrt/package/gnutls/Makefile index 3e8a31ea99..4e7ccb95e0 100644 --- a/openwrt/package/gnutls/Makefile +++ b/openwrt/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/openwrt/package/gpsd/Makefile b/openwrt/package/gpsd/Makefile index 56c562d342..2161fb75ed 100644 --- a/openwrt/package/gpsd/Makefile +++ b/openwrt/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/openwrt/package/howl/Makefile b/openwrt/package/howl/Makefile index 9bb7c7ecdc..8969f10fce 100644 --- a/openwrt/package/howl/Makefile +++ b/openwrt/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/openwrt/package/id3lib/Makefile b/openwrt/package/id3lib/Makefile index dba50c227a..7d2924aecc 100644 --- a/openwrt/package/id3lib/Makefile +++ b/openwrt/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/openwrt/package/iperf/Makefile b/openwrt/package/iperf/Makefile index 872edd25e5..a4816a629c 100644 --- a/openwrt/package/iperf/Makefile +++ b/openwrt/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/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile index 968f597acb..e40fa8e7da 100644 --- a/openwrt/package/iptables/Makefile +++ b/openwrt/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/openwrt/package/iptraf/Makefile b/openwrt/package/iptraf/Makefile index 83d3cac301..04920306ef 100644 --- a/openwrt/package/iptraf/Makefile +++ b/openwrt/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/openwrt/package/jpeg/Makefile b/openwrt/package/jpeg/Makefile index bcd7a65fc5..dbd2bd4ade 100644 --- a/openwrt/package/jpeg/Makefile +++ b/openwrt/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/openwrt/package/less/Makefile b/openwrt/package/less/Makefile index f958ed4205..51e0a5e482 100644 --- a/openwrt/package/less/Makefile +++ b/openwrt/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/openwrt/package/libamsel/Makefile b/openwrt/package/libamsel/Makefile index 795787fdfb..a14aa0470f 100644 --- a/openwrt/package/libamsel/Makefile +++ b/openwrt/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/openwrt/package/libao/Makefile b/openwrt/package/libao/Makefile index 44d010cc78..2dbe94ac95 100644 --- a/openwrt/package/libao/Makefile +++ b/openwrt/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/openwrt/package/libart/Makefile b/openwrt/package/libart/Makefile index eb01c7ad49..bbf2ead77c 100644 --- a/openwrt/package/libart/Makefile +++ b/openwrt/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/openwrt/package/libdaemon/Makefile b/openwrt/package/libdaemon/Makefile index e5e58f0a7b..e11254581b 100644 --- a/openwrt/package/libdaemon/Makefile +++ b/openwrt/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/openwrt/package/libdnet/Makefile b/openwrt/package/libdnet/Makefile index 5501b6bd98..bb48d4430d 100644 --- a/openwrt/package/libdnet/Makefile +++ b/openwrt/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/openwrt/package/libelf/Makefile b/openwrt/package/libelf/Makefile index 02ea765b0e..f6fd702c49 100644 --- a/openwrt/package/libelf/Makefile +++ b/openwrt/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/openwrt/package/libevent/Makefile b/openwrt/package/libevent/Makefile index 4b00f1dd27..7d4d56f13d 100644 --- a/openwrt/package/libevent/Makefile +++ b/openwrt/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/openwrt/package/libffi-sable/Makefile b/openwrt/package/libffi-sable/Makefile index 8b9a368f91..26bd2d9db8 100644 --- a/openwrt/package/libffi-sable/Makefile +++ b/openwrt/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/openwrt/package/libgcrypt/Makefile b/openwrt/package/libgcrypt/Makefile index 4f9077dbea..6a3028797a 100644 --- a/openwrt/package/libgcrypt/Makefile +++ b/openwrt/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/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile index 3d5d745785..aedb0af117 100644 --- a/openwrt/package/libgd/Makefile +++ b/openwrt/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/openwrt/package/libgdbm/Makefile b/openwrt/package/libgdbm/Makefile index fa8a3dc020..c6c0f606d9 100644 --- a/openwrt/package/libgdbm/Makefile +++ b/openwrt/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/openwrt/package/libgpg-error/Makefile b/openwrt/package/libgpg-error/Makefile index 48e2b5ff8e..6b34bb5e69 100644 --- a/openwrt/package/libgpg-error/Makefile +++ b/openwrt/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/openwrt/package/libid3tag/Makefile b/openwrt/package/libid3tag/Makefile index 51e458bc3e..42c9e68624 100644 --- a/openwrt/package/libid3tag/Makefile +++ b/openwrt/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/openwrt/package/libmad/Makefile b/openwrt/package/libmad/Makefile index 977248d08a..251f9834af 100644 --- a/openwrt/package/libmad/Makefile +++ b/openwrt/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/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile index 1673c0de1c..cb6e29e04d 100644 --- a/openwrt/package/libnet/Makefile +++ b/openwrt/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/openwrt/package/libnids/Makefile b/openwrt/package/libnids/Makefile index 8cb773e3e2..3748e93e09 100644 --- a/openwrt/package/libnids/Makefile +++ b/openwrt/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/openwrt/package/libogg/Makefile b/openwrt/package/libogg/Makefile index 48414238cd..6fe529b816 100644 --- a/openwrt/package/libogg/Makefile +++ b/openwrt/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/openwrt/package/libosip2/Makefile b/openwrt/package/libosip2/Makefile index bf7a224f0c..65a52831af 100644 --- a/openwrt/package/libosip2/Makefile +++ b/openwrt/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/openwrt/package/libpcap/Makefile b/openwrt/package/libpcap/Makefile index 908c364a11..fa79e7461f 100644 --- a/openwrt/package/libpcap/Makefile +++ b/openwrt/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/openwrt/package/libpng/Makefile b/openwrt/package/libpng/Makefile index 104331ba73..f6541cb9d9 100644 --- a/openwrt/package/libpng/Makefile +++ b/openwrt/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/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile index a17158dc31..ad8f44e20d 100644 --- a/openwrt/package/libpthread/Makefile +++ b/openwrt/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/openwrt/package/libtasn1/Makefile b/openwrt/package/libtasn1/Makefile index fd7836c2a2..97a7caef4d 100644 --- a/openwrt/package/libtasn1/Makefile +++ b/openwrt/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/openwrt/package/libtool/Makefile b/openwrt/package/libtool/Makefile index 2342fb0b0c..ac74a25e9f 100644 --- a/openwrt/package/libtool/Makefile +++ b/openwrt/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/openwrt/package/libupnp/Makefile b/openwrt/package/libupnp/Makefile index 88c48e7513..d09f60d64a 100644 --- a/openwrt/package/libupnp/Makefile +++ b/openwrt/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/openwrt/package/libusb/Makefile b/openwrt/package/libusb/Makefile index 486de904c7..55af3d6215 100644 --- a/openwrt/package/libusb/Makefile +++ b/openwrt/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/openwrt/package/libvorbis/Makefile b/openwrt/package/libvorbis/Makefile index 1054a7fcbb..dc7e5e09e0 100644 --- a/openwrt/package/libvorbis/Makefile +++ b/openwrt/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/openwrt/package/libvorbisidec/Makefile b/openwrt/package/libvorbisidec/Makefile index 6b78e746dd..492080b29c 100644 --- a/openwrt/package/libvorbisidec/Makefile +++ b/openwrt/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/openwrt/package/libxml2/Makefile b/openwrt/package/libxml2/Makefile index 97845095ec..d349caa7df 100644 --- a/openwrt/package/libxml2/Makefile +++ b/openwrt/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/openwrt/package/libxslt/Makefile b/openwrt/package/libxslt/Makefile index 52c42655af..91738fc1c8 100644 --- a/openwrt/package/libxslt/Makefile +++ b/openwrt/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/openwrt/package/linux-atm/Makefile b/openwrt/package/linux-atm/Makefile index ef91e287de..1cb04b48e4 100644 --- a/openwrt/package/linux-atm/Makefile +++ b/openwrt/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/openwrt/package/lua/Makefile b/openwrt/package/lua/Makefile index 95f5fec12a..4b062de335 100644 --- a/openwrt/package/lua/Makefile +++ b/openwrt/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/openwrt/package/lzo/Makefile b/openwrt/package/lzo/Makefile index 81c749b0c0..dddc3ce885 100644 --- a/openwrt/package/lzo/Makefile +++ b/openwrt/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/openwrt/package/maradns/Makefile b/openwrt/package/maradns/Makefile index 3d790ee9d6..2be8701a5e 100644 --- a/openwrt/package/maradns/Makefile +++ b/openwrt/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/openwrt/package/matrixssl/Makefile b/openwrt/package/matrixssl/Makefile index f106c4de81..dcb8214529 100644 --- a/openwrt/package/matrixssl/Makefile +++ b/openwrt/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/openwrt/package/mpd/Makefile b/openwrt/package/mpd/Makefile index f8c4f14b1b..288b62a8e6 100644 --- a/openwrt/package/mpd/Makefile +++ b/openwrt/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/openwrt/package/mtr/Makefile b/openwrt/package/mtr/Makefile index ade9df72fe..f49f2ed869 100644 --- a/openwrt/package/mtr/Makefile +++ b/openwrt/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/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile index b0af5d7e3b..055e265cdc 100644 --- a/openwrt/package/mysql/Makefile +++ b/openwrt/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/openwrt/package/nano/Makefile b/openwrt/package/nano/Makefile index 46132fb3da..5ecad7ec43 100644 --- a/openwrt/package/nano/Makefile +++ b/openwrt/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/openwrt/package/ncurses/Makefile b/openwrt/package/ncurses/Makefile index 29dedc2249..e433f557e3 100644 --- a/openwrt/package/ncurses/Makefile +++ b/openwrt/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/openwrt/package/net-snmp/Makefile b/openwrt/package/net-snmp/Makefile index fef44d5ce7..a0ffdc930b 100644 --- a/openwrt/package/net-snmp/Makefile +++ b/openwrt/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/openwrt/package/netstat-nat/Makefile b/openwrt/package/netstat-nat/Makefile index 53893ce571..a6fa4e8842 100644 --- a/openwrt/package/netstat-nat/Makefile +++ b/openwrt/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/openwrt/package/nvram/Makefile b/openwrt/package/nvram/Makefile index db8c65d332..3e4c2d3fe8 100644 --- a/openwrt/package/nvram/Makefile +++ b/openwrt/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/openwrt/package/opencdk/Makefile b/openwrt/package/opencdk/Makefile index 05cee55bff..c313c49d22 100644 --- a/openwrt/package/opencdk/Makefile +++ b/openwrt/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/openwrt/package/openldap/Makefile b/openwrt/package/openldap/Makefile index 20179b2719..382d88190c 100644 --- a/openwrt/package/openldap/Makefile +++ b/openwrt/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/openwrt/package/openssl/Makefile b/openwrt/package/openssl/Makefile index b76f02ef7e..f822e9ad54 100644 --- a/openwrt/package/openssl/Makefile +++ b/openwrt/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/openwrt/package/openvpn/Makefile b/openwrt/package/openvpn/Makefile index bf0ada2c43..d7ae22eec6 100644 --- a/openwrt/package/openvpn/Makefile +++ b/openwrt/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/openwrt/package/palantir/Makefile b/openwrt/package/palantir/Makefile index 68eac5f9eb..154dadc4ee 100644 --- a/openwrt/package/palantir/Makefile +++ b/openwrt/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/openwrt/package/pcre/Makefile b/openwrt/package/pcre/Makefile index 918ef4662d..b24d7d8a2a 100644 --- a/openwrt/package/pcre/Makefile +++ b/openwrt/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/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile index 87cb45cff1..2dec25bbb6 100644 --- a/openwrt/package/popt/Makefile +++ b/openwrt/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/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile index 12e712f50c..85fcabe9bc 100644 --- a/openwrt/package/postgresql/Makefile +++ b/openwrt/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/openwrt/package/radvd/Makefile b/openwrt/package/radvd/Makefile index 9dea426c4e..e31264b028 100644 --- a/openwrt/package/radvd/Makefile +++ b/openwrt/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/openwrt/package/rarpd/Makefile b/openwrt/package/rarpd/Makefile index f8f6b75439..44effa8676 100644 --- a/openwrt/package/rarpd/Makefile +++ b/openwrt/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/openwrt/package/readline/Makefile b/openwrt/package/readline/Makefile index c4380ded36..e9c8fdb3f9 100644 --- a/openwrt/package/readline/Makefile +++ b/openwrt/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/openwrt/package/rrdcollect/Makefile b/openwrt/package/rrdcollect/Makefile index b3be69a983..cc2e19ac43 100644 --- a/openwrt/package/rrdcollect/Makefile +++ b/openwrt/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/openwrt/package/rrdtool/Makefile b/openwrt/package/rrdtool/Makefile index 4daedd960f..136d4acaba 100644 --- a/openwrt/package/rrdtool/Makefile +++ b/openwrt/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/openwrt/package/rrdtool1/Makefile b/openwrt/package/rrdtool1/Makefile index 7df6210bb2..0dc0a47a50 100644 --- a/openwrt/package/rrdtool1/Makefile +++ b/openwrt/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/openwrt/package/rrs/Makefile b/openwrt/package/rrs/Makefile index e29636170a..68eaf4c3ac 100644 --- a/openwrt/package/rrs/Makefile +++ b/openwrt/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/openwrt/package/rsync/Makefile b/openwrt/package/rsync/Makefile index 0cad9c7d23..bd0bfab920 100644 --- a/openwrt/package/rsync/Makefile +++ b/openwrt/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/openwrt/package/screen/Makefile b/openwrt/package/screen/Makefile index c4223c4288..21873388de 100644 --- a/openwrt/package/screen/Makefile +++ b/openwrt/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/openwrt/package/speex/Makefile b/openwrt/package/speex/Makefile index 57e7ed47cf..a79ee02da4 100644 --- a/openwrt/package/speex/Makefile +++ b/openwrt/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/openwrt/package/sqlite/Makefile b/openwrt/package/sqlite/Makefile index dea4c56dbc..f36a004c71 100644 --- a/openwrt/package/sqlite/Makefile +++ b/openwrt/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/openwrt/package/sqlite2/Makefile b/openwrt/package/sqlite2/Makefile index e0f87be74a..5cb96390fa 100644 --- a/openwrt/package/sqlite2/Makefile +++ b/openwrt/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/openwrt/package/ssmtp/Makefile b/openwrt/package/ssmtp/Makefile index 0db7149d6e..54235e506f 100644 --- a/openwrt/package/ssmtp/Makefile +++ b/openwrt/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/openwrt/package/tcp_wrappers/Makefile b/openwrt/package/tcp_wrappers/Makefile index cb24ed5276..cbd68d4f63 100644 --- a/openwrt/package/tcp_wrappers/Makefile +++ b/openwrt/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/openwrt/package/tinc/Makefile b/openwrt/package/tinc/Makefile index c0e653fb26..769be77226 100644 --- a/openwrt/package/tinc/Makefile +++ b/openwrt/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/openwrt/package/uclibc++/Makefile b/openwrt/package/uclibc++/Makefile index 0b4c5eaffa..53dbbcdcc9 100644 --- a/openwrt/package/uclibc++/Makefile +++ b/openwrt/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/openwrt/package/updatedd/Makefile b/openwrt/package/updatedd/Makefile index f55542c02b..1279015fb1 100644 --- a/openwrt/package/updatedd/Makefile +++ b/openwrt/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/openwrt/package/util-linux/Makefile b/openwrt/package/util-linux/Makefile index d2cf96ec11..ad5dd19dba 100644 --- a/openwrt/package/util-linux/Makefile +++ b/openwrt/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/openwrt/package/wifidog/Makefile b/openwrt/package/wifidog/Makefile index b0992db1cf..f1b29bc022 100644 --- a/openwrt/package/wifidog/Makefile +++ b/openwrt/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/openwrt/package/wireless-tools/Makefile b/openwrt/package/wireless-tools/Makefile index c4767b2127..20f4577994 100644 --- a/openwrt/package/wireless-tools/Makefile +++ b/openwrt/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/openwrt/package/zlib/Makefile b/openwrt/package/zlib/Makefile index 2d88d51a25..099ac03893 100644 --- a/openwrt/package/zlib/Makefile +++ b/openwrt/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