diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-01-12 20:18:48 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2006-01-12 20:18:48 +0000 |
commit | f16fcce2da2b8fdcb3fa0babe90c6f713d57985a (patch) | |
tree | 3a8e3ae9f84fd091fc250ae57bac99b19a63e012 /rules | |
parent | b950e21a84698ed4ec1c6d31457f8c38541e262c (diff) | |
download | ptxdist-f16fcce2da2b8fdcb3fa0babe90c6f713d57985a.tar.gz ptxdist-f16fcce2da2b8fdcb3fa0babe90c6f713d57985a.tar.xz |
fixup dependencies
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.9-trunk@3876 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
80 files changed, 108 insertions, 1272 deletions
diff --git a/rules/mtd.make b/rules/mtd.make index 62cf60920..8be6b233a 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -32,9 +32,7 @@ MTD_DIR = $(BUILDDIR)/$(MTD) mtd_get: $(STATEDIR)/mtd.get -mtd_get_deps = $(MTD_SOURCE) - -$(STATEDIR)/mtd.get: $(mtd_get_deps_default) +$(STATEDIR)/mtd.get: $(MTD_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(MTD)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(MTD_SOURCE): mtd_extract: $(STATEDIR)/mtd.extract -mtd_extract_deps = $(STATEDIR)/mtd.get - $(STATEDIR)/mtd.extract: $(mtd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(MTD_DIR)) @@ -64,14 +60,6 @@ $(STATEDIR)/mtd.extract: $(mtd_extract_deps) mtd_prepare: $(STATEDIR)/mtd.prepare -# -# dependencies -# -mtd_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/zlib.install \ - $(STATEDIR)/mtd.extract - MTD_PATH = PATH=$(CROSS_PATH) MTD_MAKEVARS = CROSS=$(COMPILER_PREFIX) MTD_ENV = $(CROSS_ENV) @@ -86,8 +74,6 @@ $(STATEDIR)/mtd.prepare: $(mtd_prepare_deps_default) mtd_compile: $(STATEDIR)/mtd.compile -mtd_compile_deps = $(STATEDIR)/mtd.prepare - $(STATEDIR)/mtd.compile: $(mtd_compile_deps_default) @$(call targetinfo, $@) @@ -163,14 +149,6 @@ $(STATEDIR)/mtd.install: $(STATEDIR)/mtd.compile mtd_targetinstall: $(STATEDIR)/mtd.targetinstall -mtd_targetinstall_deps = $(STATEDIR)/mtd.compile -ifdef PTXCONF_MTD_MKJFFS -mtd_targetinstall_deps += $(STATEDIR)/zlib.targetinstall -endif -ifdef PTXCONF_MTD_MKJFFS2 -mtd_targetinstall_deps += $(STATEDIR)/zlib.targetinstall -endif - $(STATEDIR)/mtd.targetinstall: $(mtd_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/myghty.make b/rules/myghty.make index 3ca607a1a..9887a8467 100644 --- a/rules/myghty.make +++ b/rules/myghty.make @@ -32,9 +32,7 @@ MYGHTY_DIR = $(BUILDDIR)/$(MYGHTY) myghty_get: $(STATEDIR)/myghty.get -myghty_get_deps = $(MYGHTY_SOURCE) - -$(STATEDIR)/myghty.get: $(myghty_get_deps_default) +$(STATEDIR)/myghty.get: $(MYGHTY_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(MYGHTY_SOURCE): myghty_extract: $(STATEDIR)/myghty.extract -myghty_extract_deps = $(STATEDIR)/myghty.get - $(STATEDIR)/myghty.extract: $(myghty_extract_deps) @$(call targetinfo, $@) @$(call clean, $(MYGHTY_DIR)) @@ -63,16 +59,8 @@ $(STATEDIR)/myghty.extract: $(myghty_extract_deps) myghty_prepare: $(STATEDIR)/myghty.prepare -# -# dependencies -# -myghty_prepare_deps = \ - $(STATEDIR)/myghty.extract \ - $(STATEDIR)/virtual-xchain.install - MYGHTY_PATH = PATH=$(CROSS_PATH) MYGHTY_ENV = $(CROSS_ENV) -MYGHTY_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -90,8 +78,6 @@ $(STATEDIR)/myghty.prepare: $(myghty_prepare_deps_default) myghty_compile: $(STATEDIR)/myghty.compile -myghty_compile_deps = $(STATEDIR)/myghty.prepare - $(STATEDIR)/myghty.compile: $(myghty_compile_deps_default) @$(call targetinfo, $@) #cd $(MYGHTY_DIR) && $(MYGHTY_ENV) $(MYGHTY_PATH) make @@ -115,8 +101,6 @@ $(STATEDIR)/myghty.install: $(STATEDIR)/myghty.compile myghty_targetinstall: $(STATEDIR)/myghty.targetinstall -myghty_targetinstall_deps = $(STATEDIR)/myghty.compile - $(STATEDIR)/myghty.targetinstall: $(myghty_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/nano.make b/rules/nano.make index dce370fbd..26a622353 100644 --- a/rules/nano.make +++ b/rules/nano.make @@ -32,9 +32,7 @@ NANO_DIR = $(BUILDDIR)/$(NANO) nano_get: $(STATEDIR)/nano.get -nano_get_deps = $(NANO_SOURCE) - -$(STATEDIR)/nano.get: $(nano_get_deps_default) +$(STATEDIR)/nano.get: $(NANO_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(NANO)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(NANO_SOURCE): nano_extract: $(STATEDIR)/nano.extract -nano_extract_deps = $(STATEDIR)/nano.get - $(STATEDIR)/nano.extract: $(nano_extract_deps) @$(call targetinfo, $@) @$(call clean, $(NANO_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/nano.extract: $(nano_extract_deps) nano_prepare: $(STATEDIR)/nano.prepare -# -# dependencies -# -nano_prepare_deps = \ - $(STATEDIR)/nano.extract \ - $(STATEDIR)/virtual-xchain.install - NANO_PATH = PATH=$(CROSS_PATH) NANO_ENV = $(CROSS_ENV) -#NANO_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#NANO_ENV += # # autoconf @@ -95,8 +82,6 @@ $(STATEDIR)/nano.prepare: $(nano_prepare_deps_default) nano_compile: $(STATEDIR)/nano.compile -nano_compile_deps = $(STATEDIR)/nano.prepare - $(STATEDIR)/nano.compile: $(nano_compile_deps_default) @$(call targetinfo, $@) cd $(NANO_DIR) && $(NANO_ENV) $(NANO_PATH) make @@ -120,8 +105,6 @@ $(STATEDIR)/nano.install: $(STATEDIR)/nano.compile nano_targetinstall: $(STATEDIR)/nano.targetinstall -nano_targetinstall_deps = $(STATEDIR)/nano.compile - $(STATEDIR)/nano.targetinstall: $(nano_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/ncurses.make b/rules/ncurses.make index 6b1d9222b..75c60d82c 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -59,13 +59,6 @@ $(STATEDIR)/ncurses.extract: $(STATEDIR)/ncurses.get ncurses_prepare: $(STATEDIR)/ncurses.prepare -# -# dependencies -# -ncurses_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/ncurses.extract - NCURSES_PATH = PATH=$(CROSS_PATH) NCURSES_ENV = $(CROSS_ENV) diff --git a/rules/netcat.make b/rules/netcat.make index 4e6012795..449a8d0a2 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -32,9 +32,7 @@ NETCAT_DIR = $(BUILDDIR)/$(NETCAT) netcat_get: $(STATEDIR)/netcat.get -netcat_get_deps = $(NETCAT_SOURCE) - -$(STATEDIR)/netcat.get: $(netcat_get_deps_default) +$(STATEDIR)/netcat.get: $(NETCAT_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(NETCAT)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(NETCAT_SOURCE): netcat_extract: $(STATEDIR)/netcat.extract -netcat_extract_deps = $(STATEDIR)/netcat.get - $(STATEDIR)/netcat.extract: $(netcat_extract_deps) @$(call targetinfo, $@) @$(call clean, $(NETCAT_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/netcat.extract: $(netcat_extract_deps) netcat_prepare: $(STATEDIR)/netcat.prepare -# -# dependencies -# -netcat_prepare_deps = \ - $(STATEDIR)/netcat.extract \ - $(STATEDIR)/virtual-xchain.install - NETCAT_PATH = PATH=$(CROSS_PATH) NETCAT_ENV = $(CROSS_ENV) -#NETCAT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#NETCAT_ENV += # # autoconf @@ -108,8 +95,6 @@ $(STATEDIR)/netcat.prepare: $(netcat_prepare_deps_default) netcat_compile: $(STATEDIR)/netcat.compile -netcat_compile_deps = $(STATEDIR)/netcat.prepare - $(STATEDIR)/netcat.compile: $(netcat_compile_deps_default) @$(call targetinfo, $@) cd $(NETCAT_DIR) && $(NETCAT_ENV) $(NETCAT_PATH) make @@ -132,8 +117,6 @@ $(STATEDIR)/netcat.install: $(STATEDIR)/netcat.compile netcat_targetinstall: $(STATEDIR)/netcat.targetinstall -netcat_targetinstall_deps = $(STATEDIR)/netcat.compile - $(STATEDIR)/netcat.targetinstall: $(netcat_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make index e1477d359..0778d7656 100644 --- a/rules/netkit-ftp.make +++ b/rules/netkit-ftp.make @@ -31,9 +31,7 @@ NETKIT-FTP_DIR = $(BUILDDIR)/$(NETKIT-FTP) netkit-ftp_get: $(STATEDIR)/netkit-ftp.get -netkit-ftp_get_deps = $(NETKIT-FTP_SOURCE) - -$(STATEDIR)/netkit-ftp.get: $(netkit-ftp_get_deps_default) +$(STATEDIR)/netkit-ftp.get: $(NETKIT-FTP_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(NETKIT-FTP)) @$(call touch, $@) @@ -48,8 +46,6 @@ $(NETKIT-FTP_SOURCE): netkit-ftp_extract: $(STATEDIR)/netkit-ftp.extract -netkit-ftp_extract_deps = $(STATEDIR)/netkit-ftp.get - $(STATEDIR)/netkit-ftp.extract: $(netkit-ftp_extract_deps) @$(call targetinfo, $@) @$(call clean, $(NETKIT-FTP_DIR)) @@ -63,17 +59,8 @@ $(STATEDIR)/netkit-ftp.extract: $(netkit-ftp_extract_deps) netkit-ftp_prepare: $(STATEDIR)/netkit-ftp.prepare -# -# dependencies -# -netkit-ftp_prepare_deps = \ - $(STATEDIR)/netkit-ftp.extract \ - $(STATEDIR)/virtual-xchain.install - NETKIT-FTP_PATH = PATH=$(CROSS_PATH) NETKIT-FTP_ENV = $(CROSS_ENV) -#NETKIT-FTP_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#NETKIT-FTP_ENV += # # autoconf @@ -106,8 +93,6 @@ $(STATEDIR)/netkit-ftp.prepare: $(netkit-ftp_prepare_deps_default) netkit-ftp_compile: $(STATEDIR)/netkit-ftp.compile -netkit-ftp_compile_deps = $(STATEDIR)/netkit-ftp.prepare - $(STATEDIR)/netkit-ftp.compile: $(netkit-ftp_compile_deps_default) @$(call targetinfo, $@) cd $(NETKIT-FTP_DIR) && $(NETKIT-FTP_ENV) $(NETKIT-FTP_PATH) make @@ -131,8 +116,6 @@ $(STATEDIR)/netkit-ftp.install: $(STATEDIR)/netkit-ftp.compile netkit-ftp_targetinstall: $(STATEDIR)/netkit-ftp.targetinstall -netkit-ftp_targetinstall_deps = $(STATEDIR)/netkit-ftp.compile - $(STATEDIR)/netkit-ftp.targetinstall: $(netkit-ftp_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/nfs-utils.make b/rules/nfs-utils.make index 05663ad42..24064369f 100644 --- a/rules/nfs-utils.make +++ b/rules/nfs-utils.make @@ -45,7 +45,7 @@ $(NFSUTILS_SOURCE): nfsutils_extract: $(STATEDIR)/nfsutils.extract -$(STATEDIR)/nfsutils.extract: $(STATEDIR)/nfsutils.get $(STATEDIR)/autoconf257.install +$(STATEDIR)/nfsutils.extract: $(nfsutils_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(NFSUTILS_DIR)) @$(call extract, $(NFSUTILS_SOURCE)) @@ -98,10 +98,6 @@ else NFSUTILS_AUTOCONF += --without-tcpwrappers endif -nfsutils_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/nfsutils.extract - $(STATEDIR)/nfsutils.prepare: $(nfsutils_prepare_deps_default) @$(call targetinfo, $@) cd $(NFSUTILS_DIR) && \ diff --git a/rules/nmap.make b/rules/nmap.make index cab77dde9..9c60413e6 100644 --- a/rules/nmap.make +++ b/rules/nmap.make @@ -39,9 +39,7 @@ NMAP_DIR = $(BUILDDIR)/$(NMAP) nmap_get: $(STATEDIR)/nmap.get -nmap_get_deps = $(NMAP_SOURCE) - -$(STATEDIR)/nmap.get: $(nmap_get_deps_default) +$(STATEDIR)/nmap.get: $(NMAP_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -68,14 +66,6 @@ $(STATEDIR)/nmap.extract: $(STATEDIR)/nmap.get nmap_prepare: $(STATEDIR)/nmap.prepare -# -# dependencies -# -nmap_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/nmap.extract \ - $(STATEDIR)/libpcap.install - NMAP_PATH = PATH=$(CROSS_PATH) NMAP_ENV = \ $(CROSS_ENV) \ @@ -93,7 +83,6 @@ NMAP_AUTOCONF += --with-pcap=linux # ifdef PTXCONF_OPENSSL_SHARED NMAP_AUTOCONF += --with-openssl=$(CROSS_LIB_DIR) -nmap_prepare_deps += $(STATEDIR)/openssl.install else NMAP_AUTOCONF += --without-openssl endif @@ -111,8 +100,6 @@ $(STATEDIR)/nmap.prepare: $(nmap_prepare_deps_default) nmap_compile: $(STATEDIR)/nmap.compile -nmap_compile_deps = $(STATEDIR)/nmap.prepare - $(STATEDIR)/nmap.compile: $(nmap_compile_deps_default) @$(call targetinfo, $@) # @@ -138,11 +125,6 @@ $(STATEDIR)/nmap.install: $(STATEDIR)/nmap.compile nmap_targetinstall: $(STATEDIR)/nmap.targetinstall -nmap_targetinstall_deps = $(STATEDIR)/nmap.install -ifdef PTXCONF_OPENSSL_SHARED -nmap_targetinstall_deps += $(STATEDIR)/openssl.targetinstall -endif - $(STATEDIR)/nmap.targetinstall: $(nmap_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/ntp.make b/rules/ntp.make index 2c161185a..97735e605 100644 --- a/rules/ntp.make +++ b/rules/ntp.make @@ -32,9 +32,7 @@ NTP_DIR = $(BUILDDIR)/$(NTP) ntp_get: $(STATEDIR)/ntp.get -ntp_get_deps = $(NTP_SOURCE) - -$(STATEDIR)/ntp.get: $(ntp_get_deps_default) +$(STATEDIR)/ntp.get: $(NTP_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(NTP)) @$(call touch, $@) @@ -49,9 +47,6 @@ $(NTP_SOURCE): ntp_extract: $(STATEDIR)/ntp.extract -ntp_extract_deps = $(STATEDIR)/ntp.get - -$(STATEDIR)/ntp.extract: $(ntp_extract_deps) @$(call targetinfo, $@) @$(call clean, $(NTP_DIR)) @$(call extract, $(NTP_SOURCE)) @@ -64,16 +59,8 @@ $(STATEDIR)/ntp.extract: $(ntp_extract_deps) ntp_prepare: $(STATEDIR)/ntp.prepare -# -# dependencies -# -ntp_prepare_deps = \ - $(STATEDIR)/ntp.extract \ - $(STATEDIR)/virtual-xchain.install - NTP_PATH = PATH=$(CROSS_PATH) NTP_ENV = $(CROSS_ENV) -#NTP_ENV += # # autoconf @@ -327,8 +314,6 @@ $(STATEDIR)/ntp.prepare: $(ntp_prepare_deps_default) ntp_compile: $(STATEDIR)/ntp.compile -ntp_compile_deps = $(STATEDIR)/ntp.prepare - $(STATEDIR)/ntp.compile: $(ntp_compile_deps_default) @$(call targetinfo, $@) @@ -359,8 +344,6 @@ $(STATEDIR)/ntp.install: $(STATEDIR)/ntp.compile ntp_targetinstall: $(STATEDIR)/ntp.targetinstall -ntp_targetinstall_deps = $(STATEDIR)/ntp.compile - $(STATEDIR)/ntp.targetinstall: $(ntp_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/ntpclient.make b/rules/ntpclient.make index efbdbfb0a..9eaa80e58 100644 --- a/rules/ntpclient.make +++ b/rules/ntpclient.make @@ -24,9 +24,7 @@ NTPCLIENT_DIR = $(BUILDDIR)/$(NTPCLIENT) ntpclient_get: $(STATEDIR)/ntpclient.get -ntpclient_get_deps = $(NTPCLIENT_SOURCE) - -$(STATEDIR)/ntpclient.get: $(ntpclient_get_deps_default) +$(STATEDIR)/ntpclient.get: $(NTPCLIENT_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -40,8 +38,6 @@ $(NTPCLIENT_SOURCE): ntpclient_extract: $(STATEDIR)/ntpclient.extract -ntpclient_extract_deps = $(STATEDIR)/ntpclient.get - $(STATEDIR)/ntpclient.extract: $(ntpclient_extract_deps) @$(call targetinfo, $@) @$(call clean, $(NTPCLIENT_DIR)) @@ -55,13 +51,6 @@ $(STATEDIR)/ntpclient.extract: $(ntpclient_extract_deps) ntpclient_prepare: $(STATEDIR)/ntpclient.prepare -# -# dependencies -# -ntpclient_prepare_deps = \ - $(STATEDIR)/ntpclient.extract \ - $(STATEDIR)/virtual-xchain.install - NTPCLIENT_PATH = PATH=$(CROSS_PATH) NTPCLIENT_ENV = $(CROSS_ENV) @@ -75,8 +64,6 @@ $(STATEDIR)/ntpclient.prepare: $(ntpclient_prepare_deps_default) ntpclient_compile: $(STATEDIR)/ntpclient.compile -ntpclient_compile_deps = $(STATEDIR)/ntpclient.prepare - $(STATEDIR)/ntpclient.compile: $(ntpclient_compile_deps_default) @$(call targetinfo, $@) cd $(NTPCLIENT_DIR) && $(NTPCLIENT_ENV) $(NTPCLIENT_PATH) make @@ -98,8 +85,6 @@ $(STATEDIR)/ntpclient.install: $(STATEDIR)/ntpclient.compile ntpclient_targetinstall: $(STATEDIR)/ntpclient.targetinstall -ntpclient_targetinstall_deps = $(STATEDIR)/ntpclient.compile - $(STATEDIR)/ntpclient.targetinstall: $(ntpclient_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/omniorb.make b/rules/omniorb.make index 5c8699999..86b4022ed 100644 --- a/rules/omniorb.make +++ b/rules/omniorb.make @@ -34,8 +34,6 @@ OMNIORB_DIR = $(BUILDDIR)/$(OMNIORB) omniorb_get: $(STATEDIR)/omniorb.get -omniorb_get_deps = $(OMNIORB_SOURCE) - $(STATEDIR)/omniorb.get: $(omniorb_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(OMNIORB)) @@ -51,8 +49,6 @@ $(OMNIORB_SOURCE): omniorb_extract: $(STATEDIR)/omniorb.extract -omniorb_extract_deps = $(STATEDIR)/omniorb.get - $(STATEDIR)/omniorb.extract: $(omniorb_extract_deps) @$(call targetinfo, $@) @$(call clean, $(OMNIORB_DIR)) @@ -66,13 +62,6 @@ $(STATEDIR)/omniorb.extract: $(omniorb_extract_deps) omniorb_prepare: $(STATEDIR)/omniorb.prepare -# -# dependencies -# -omniorb_prepare_deps = \ - $(STATEDIR)/omniorb.extract \ - $(STATEDIR)/virtual-xchain.install - OMNIORB_PATH = PATH=$(CROSS_PATH) OMNIORB_ENV = $(CROSS_ENV) @@ -98,8 +87,6 @@ $(STATEDIR)/omniorb.prepare: $(omniorb_prepare_deps_default) omniorb_compile: $(STATEDIR)/omniorb.compile -omniorb_compile_deps = $(STATEDIR)/omniorb.prepare - $(STATEDIR)/omniorb.compile: $(omniorb_compile_deps_default) @$(call targetinfo, $@) cd $(OMNIORB_DIR) && $(OMNIORB_ENV) $(OMNIORB_PATH) make @@ -122,8 +109,6 @@ $(STATEDIR)/omniorb.install: $(STATEDIR)/omniorb.compile omniorb_targetinstall: $(STATEDIR)/omniorb.targetinstall -omniorb_targetinstall_deps = $(STATEDIR)/omniorb.compile - $(STATEDIR)/omniorb.targetinstall: $(omniorb_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/openafs.make b/rules/openafs.make index d80a47cb3..dab830ed2 100644 --- a/rules/openafs.make +++ b/rules/openafs.make @@ -32,9 +32,7 @@ OPENAFS_DIR = $(BUILDDIR)/$(OPENAFS) openafs_get: $(STATEDIR)/openafs.get -openafs_get_deps = $(OPENAFS_SOURCE) - -$(STATEDIR)/openafs.get: $(openafs_get_deps_default) +$(STATEDIR)/openafs.get: $(OPENAFS_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(OPENAFS_SOURCE): openafs_extract: $(STATEDIR)/openafs.extract -openafs_extract_deps = $(STATEDIR)/openafs.get - $(STATEDIR)/openafs.extract: $(openafs_extract_deps) @$(call targetinfo, $@) @$(call clean, $(OPENAFS_DIR)) @@ -63,18 +59,8 @@ $(STATEDIR)/openafs.extract: $(openafs_extract_deps) openafs_prepare: $(STATEDIR)/openafs.prepare -# -# dependencies -# -openafs_prepare_deps = \ - kernel_targetinstall \ - $(STATEDIR)/openafs.extract \ - openafs-openafs-ptx-build_install \ - $(STATEDIR)/virtual-xchain.install - OPENAFS_PATH = PATH=$(CROSS_PATH) OPENAFS_ENV = $(CROSS_ENV) -#OPENAFS_ENV += # # autoconf @@ -100,8 +86,6 @@ $(STATEDIR)/openafs.prepare: $(openafs_prepare_deps_default) openafs_compile: $(STATEDIR)/openafs.compile -openafs_compile_deps = $(STATEDIR)/openafs.prepare - $(STATEDIR)/openafs.compile: $(openafs_compile_deps_default) @$(call targetinfo, $@) cd $(OPENAFS_DIR) && $(OPENAFS_PATH) make @@ -124,8 +108,6 @@ $(STATEDIR)/openafs.install: $(STATEDIR)/openafs.compile openafs_targetinstall: $(STATEDIR)/openafs.targetinstall -openafs_targetinstall_deps = $(STATEDIR)/openafs.compile - $(STATEDIR)/openafs.targetinstall: $(openafs_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/openntpd.make b/rules/openntpd.make index a1e61a7b0..76ac8d289 100644 --- a/rules/openntpd.make +++ b/rules/openntpd.make @@ -31,9 +31,7 @@ OPENNTPD_DIR = $(BUILDDIR)/$(OPENNTPD) openntpd_get: $(STATEDIR)/openntpd.get -openntpd_get_deps = $(OPENNTPD_SOURCE) - -$(STATEDIR)/openntpd.get: $(openntpd_get_deps_default) +$(STATEDIR)/openntpd.get: $(OPENNTPD_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(OPENNTPD)) @$(call touch, $@) @@ -48,8 +46,6 @@ $(OPENNTPD_SOURCE): openntpd_extract: $(STATEDIR)/openntpd.extract -openntpd_extract_deps = $(STATEDIR)/openntpd.get - $(STATEDIR)/openntpd.extract: $(openntpd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(OPENNTPD_DIR)) @@ -63,17 +59,8 @@ $(STATEDIR)/openntpd.extract: $(openntpd_extract_deps) openntpd_prepare: $(STATEDIR)/openntpd.prepare -# -# dependencies -# -openntpd_prepare_deps = \ - $(STATEDIR)/openntpd.extract \ - $(STATEDIR)/virtual-xchain.install - OPENNTPD_PATH = PATH=$(CROSS_PATH) OPENNTPD_ENV = $(CROSS_ENV) -#OPENNTPD_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#OPENNTPD_ENV += # # autoconf @@ -103,8 +90,6 @@ $(STATEDIR)/openntpd.prepare: $(openntpd_prepare_deps_default) openntpd_compile: $(STATEDIR)/openntpd.compile -openntpd_compile_deps = $(STATEDIR)/openntpd.prepare - $(STATEDIR)/openntpd.compile: $(openntpd_compile_deps_default) @$(call targetinfo, $@) cd $(OPENNTPD_DIR) && $(OPENNTPD_ENV) $(OPENNTPD_PATH) make @@ -127,8 +112,6 @@ $(STATEDIR)/openntpd.install: $(STATEDIR)/openntpd.compile openntpd_targetinstall: $(STATEDIR)/openntpd.targetinstall -openntpd_targetinstall_deps = $(STATEDIR)/openntpd.compile - $(STATEDIR)/openntpd.targetinstall: $(openntpd_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/openssh.make b/rules/openssh.make index 39b1a78d4..f590ed52b 100644 --- a/rules/openssh.make +++ b/rules/openssh.make @@ -53,16 +53,6 @@ $(OPENSSH_SOURCE): openssh_extract: $(STATEDIR)/openssh.extract -# -# we depend on openssl.install, because we need the header files -# to patch configure.ac with the version string of the installed -# openssl packet -# -openssh_extract_deps = \ - $(STATEDIR)/autoconf257.install \ - $(STATEDIR)/openssl.install \ - $(STATEDIR)/openssh.get - $(STATEDIR)/openssh.extract: $(openssh_extract_deps) @$(call targetinfo, openssh.extract) @$(call clean, $(OPENSSH_DIR)) @@ -87,14 +77,6 @@ $(STATEDIR)/openssh.extract: $(openssh_extract_deps) openssh_prepare: $(STATEDIR)/openssh.prepare -# -# dependencies -# -openssh_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/zlib.install \ - $(STATEDIR)/openssh.extract - OPENSSH_PATH = PATH=$(CROSS_PATH) # # openssh is a little F*CKED up, is won't compile without LD=gcc in environment @@ -181,11 +163,6 @@ $(STATEDIR)/openssh.install: $(STATEDIR)/openssh.compile openssh_targetinstall: $(STATEDIR)/openssh.targetinstall -openssh_targetinstall_deps = \ - $(STATEDIR)/openssl.targetinstall \ - $(STATEDIR)/zlib.targetinstall \ - $(STATEDIR)/openssh.compile - $(STATEDIR)/openssh.targetinstall: $(openssh_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/openssl.make b/rules/openssl.make index e8a3907de..8099843e3 100644 --- a/rules/openssl.make +++ b/rules/openssl.make @@ -88,10 +88,6 @@ $(STATEDIR)/openssl.extract: $(STATEDIR)/openssl.get openssl_prepare: $(STATEDIR)/openssl.prepare -openssl_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/openssl.extract - OPENSSL_PATH = PATH=$(CROSS_PATH) OPENSSL_MAKEVARS = \ $(CROSS_ENV_CC) \ @@ -159,9 +155,6 @@ $(STATEDIR)/openssl.install: $(STATEDIR)/openssl.compile openssl_targetinstall: $(STATEDIR)/openssl.targetinstall -openssl_targetinstall_deps = \ - $(STATEDIR)/openssl.install - $(STATEDIR)/openssl.targetinstall: $(openssl_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/oprofile.make b/rules/oprofile.make index 9abd9f04f..1650a8fa8 100644 --- a/rules/oprofile.make +++ b/rules/oprofile.make @@ -32,8 +32,6 @@ OPROFILE_DIR = $(BUILDDIR)/$(OPROFILE) oprofile_get: $(STATEDIR)/oprofile.get -oprofile_get_deps = $(OPROFILE_SOURCE) - $(STATEDIR)/oprofile.get: $(oprofile_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(OPROFILE_SOURCE): oprofile_extract: $(STATEDIR)/oprofile.extract -oprofile_extract_deps = $(STATEDIR)/oprofile.get - $(STATEDIR)/oprofile.extract: $(oprofile_extract_deps) @$(call targetinfo, $@) @$(call clean, $(OPROFILE_DIR)) @@ -63,14 +59,6 @@ $(STATEDIR)/oprofile.extract: $(oprofile_extract_deps) oprofile_prepare: $(STATEDIR)/oprofile.prepare -# -# dependencies -# -oprofile_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/popt.install \ - $(STATEDIR)/oprofile.extract - OPROFILE_PATH = PATH=$(CROSS_PATH) OPROFILE_ENV = $(CROSS_ENV) @@ -101,8 +89,6 @@ $(STATEDIR)/oprofile.prepare: $(oprofile_prepare_deps_default) oprofile_compile: $(STATEDIR)/oprofile.compile -oprofile_compile_deps = $(STATEDIR)/oprofile.prepare - $(STATEDIR)/oprofile.compile: $(oprofile_compile_deps_default) @$(call targetinfo, $@) $(OPROFILE_PATH) make -C $(OPROFILE_DIR) $(OPROFILE_MAKEVARS) @@ -125,8 +111,6 @@ $(STATEDIR)/oprofile.install: $(STATEDIR)/oprofile.compile oprofile_targetinstall: $(STATEDIR)/oprofile.targetinstall -oprofile_targetinstall_deps = $(STATEDIR)/oprofile.compile - $(STATEDIR)/oprofile.targetinstall: $(oprofile_targetinstall_deps_default) @$(call targetinfo, $@) # FIXME: nothing to do on targetinstall? diff --git a/rules/pango12.make b/rules/pango12.make index db92e42c7..a30a4fc74 100644 --- a/rules/pango12.make +++ b/rules/pango12.make @@ -34,10 +34,7 @@ PANGO_MODULE_VERSION = 1.4 pango12_get: $(STATEDIR)/pango12.get -pango12_get_deps = $(PANGO12_SOURCE) -pango12_get_deps += $(PANGO12_PATCH_SOURCE) - -$(STATEDIR)/pango12.get: $(pango12_get_deps_default) +$(STATEDIR)/pango12.get: $(PANGO12_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -45,18 +42,12 @@ $(PANGO12_SOURCE): @$(call targetinfo, $@) @$(call get, $(PANGO12_URL)) -$(PANGO12_PATCH_SOURCE): - @$(call targetinfo, $@) - @$(call get, $(PANGO12_PATCH_URL)) - # ---------------------------------------------------------------------------- # Extract # ---------------------------------------------------------------------------- pango12_extract: $(STATEDIR)/pango12.extract -pango12_extract_deps = $(STATEDIR)/pango12.get - $(STATEDIR)/pango12.extract: $(pango12_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PANGO12_DIR)) @@ -70,21 +61,8 @@ $(STATEDIR)/pango12.extract: $(pango12_extract_deps) pango12_prepare: $(STATEDIR)/pango12.prepare -# -# dependencies -# -pango12_prepare_deps = \ - $(STATEDIR)/pango12.extract \ - $(STATEDIR)/glib22.install \ - $(STATEDIR)/xfree430.install \ - $(STATEDIR)/fontconfig22.install \ - $(STATEDIR)/freetype.install \ - $(STATEDIR)/virtual-xchain.install - - PANGO12_PATH = PATH=$(CROSS_PATH) PANGO12_ENV = $(CROSS_ENV) -PANGO12_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ # # autoconf @@ -107,8 +85,6 @@ $(STATEDIR)/pango12.prepare: $(pango12_prepare_deps_default) pango12_compile: $(STATEDIR)/pango12.compile -pango12_compile_deps = $(STATEDIR)/pango12.prepare - $(STATEDIR)/pango12.compile: $(pango12_compile_deps_default) @$(call targetinfo, $@) cd $(PANGO12_DIR) && $(PANGO12_PATH) $(PANGO12_ENV) make @@ -131,12 +107,6 @@ $(STATEDIR)/pango12.install: $(STATEDIR)/pango12.compile pango12_targetinstall: $(STATEDIR)/pango12.targetinstall -pango12_targetinstall_deps = $(STATEDIR)/pango12.install -pango12_targetinstall_deps += $(STATEDIR)/glib22.targetinstall -pango12_targetinstall_deps += $(STATEDIR)/xfree430.targetinstall -pango12_targetinstall_deps += $(STATEDIR)/fontconfig22.targetinstall -pango12_targetinstall_deps += $(STATEDIR)/freetype.targetinstall - $(STATEDIR)/pango12.targetinstall: $(pango12_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/paranoia.make b/rules/paranoia.make index 0c91d880c..00214d3ce 100644 --- a/rules/paranoia.make +++ b/rules/paranoia.make @@ -32,9 +32,7 @@ PARANOIA_DIR = $(BUILDDIR)/$(PARANOIA) paranoia_get: $(STATEDIR)/paranoia.get -paranoia_get_deps = $(PARANOIA_SOURCE) - -$(STATEDIR)/paranoia.get: $(paranoia_get_deps_default) +$(STATEDIR)/paranoia.get: $(PARANOIA_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PARANOIA)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(PARANOIA_SOURCE): paranoia_extract: $(STATEDIR)/paranoia.extract -paranoia_extract_deps = $(STATEDIR)/paranoia.get - $(STATEDIR)/paranoia.extract: $(paranoia_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PARANOIA_DIR)) @@ -65,12 +61,6 @@ $(STATEDIR)/paranoia.extract: $(paranoia_extract_deps) paranoia_prepare: $(STATEDIR)/paranoia.prepare -# -# dependencies -# -paranoia_prepare_deps = $(STATEDIR)/paranoia.extract \ -paranoia_prepare_deps += $(STATEDIR)/virtual-xchain.install - PARANOIA_PATH = PATH=$(CROSS_PATH) PARANOIA_ENV = $(CROSS_ENV) @@ -84,8 +74,6 @@ $(STATEDIR)/paranoia.prepare: $(paranoia_prepare_deps_default) paranoia_compile: $(STATEDIR)/paranoia.compile -paranoia_compile_deps = $(STATEDIR)/paranoia.prepare - $(STATEDIR)/paranoia.compile: $(paranoia_compile_deps_default) @$(call targetinfo, $@) cd $(PARANOIA_DIR) && \ @@ -108,8 +96,6 @@ $(STATEDIR)/paranoia.install: $(STATEDIR)/paranoia.compile paranoia_targetinstall: $(STATEDIR)/paranoia.targetinstall -paranoia_targetinstall_deps = $(STATEDIR)/paranoia.compile - $(STATEDIR)/paranoia.targetinstall: $(paranoia_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/pcmcia-cs.make b/rules/pcmcia-cs.make index 5c720223a..279f580d8 100644 --- a/rules/pcmcia-cs.make +++ b/rules/pcmcia-cs.make @@ -32,8 +32,6 @@ PCMCIA-CS_DIR = $(BUILDDIR)/$(PCMCIA-CS) pcmcia-cs_get: $(STATEDIR)/pcmcia-cs.get -pcmcia-cs_get_deps = $(PCMCIA-CS_SOURCE) - $(STATEDIR)/pcmcia-cs.get: $(pcmcia-cs_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(PCMCIA-CS_SOURCE): pcmcia-cs_extract: $(STATEDIR)/pcmcia-cs.extract -pcmcia-cs_extract_deps = $(STATEDIR)/pcmcia-cs.get - $(STATEDIR)/pcmcia-cs.extract: $(pcmcia-cs_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PCMCIA-CS_DIR)) @@ -63,17 +59,8 @@ $(STATEDIR)/pcmcia-cs.extract: $(pcmcia-cs_extract_deps) pcmcia-cs_prepare: $(STATEDIR)/pcmcia-cs.prepare -# -# dependencies -# -pcmcia-cs_prepare_deps = \ - $(STATEDIR)/pcmcia-cs.extract \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/kernel.prepare \ - PCMCIA-CS_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) PCMCIA-CS_ENV = $(CROSS_ENV) -#PCMCIA-CS_ENV += PCMCIA-CS_CONF = --noprompt PCMCIA-CS_CONF += --kernel=$(KERNEL_DIR) diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make index db0969d55..199cc8fd1 100644 --- a/rules/pcmciautils.make +++ b/rules/pcmciautils.make @@ -31,8 +31,6 @@ PCMCIAUTILS_DIR = $(BUILDDIR)/$(PCMCIAUTILS) pcmciautils_get: $(STATEDIR)/pcmciautils.get -pcmciautils_get_deps = $(PCMCIAUTILS_SOURCE) - $(STATEDIR)/pcmciautils.get: $(pcmciautils_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(PCMCIAUTILS)) @@ -48,8 +46,6 @@ $(PCMCIAUTILS_SOURCE): pcmciautils_extract: $(STATEDIR)/pcmciautils.extract -pcmciautils_extract_deps = $(STATEDIR)/pcmciautils.get - $(STATEDIR)/pcmciautils.extract: $(pcmciautils_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PCMCIAUTILS_DIR)) @@ -63,18 +59,8 @@ $(STATEDIR)/pcmciautils.extract: $(pcmciautils_extract_deps) pcmciautils_prepare: $(STATEDIR)/pcmciautils.prepare -# -# dependencies -# -pcmciautils_prepare_deps = \ - $(STATEDIR)/pcmciautils.extract \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/sysfsutils.install - PCMCIAUTILS_PATH = PATH=$(CROSS_PATH) PCMCIAUTILS_ENV = $(CROSS_ENV) -#PCMCIAUTILS_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#PCMCIAUTILS_ENV += # Get the latest revision of pcmciautils. # If you have a static socket, open the file "Makefile" with an editor of your @@ -105,8 +91,6 @@ endif pcmciautils_compile: $(STATEDIR)/pcmciautils.compile -pcmciautils_compile_deps = $(STATEDIR)/pcmciautils.prepare - $(STATEDIR)/pcmciautils.compile: $(pcmciautils_compile_deps_default) @$(call targetinfo, $@) cd $(PCMCIAUTILS_DIR) && $(PCMCIAUTILS_ENV) $(PCMCIAUTILS_PATH) make $(PCMCIAUTILS_MAKEVARS) @@ -128,8 +112,6 @@ $(STATEDIR)/pcmciautils.install: $(STATEDIR)/pcmciautils.compile pcmciautils_targetinstall: $(STATEDIR)/pcmciautils.targetinstall -pcmciautils_targetinstall_deps = $(STATEDIR)/pcmciautils.compile - $(STATEDIR)/pcmciautils.targetinstall: $(pcmciautils_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/pcre.make b/rules/pcre.make index 648d69d5d..604bf74b0 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -33,8 +33,6 @@ PCRE_DIR = $(BUILDDIR)/$(PCRE) pcre_get: $(STATEDIR)/pcre.get -pcre_get_deps = $(PCRE_SOURCE) - $(STATEDIR)/pcre.get: $(pcre_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(PCRE)) @@ -50,8 +48,6 @@ $(PCRE_SOURCE): pcre_extract: $(STATEDIR)/pcre.extract -pcre_extract_deps = $(STATEDIR)/pcre.get - $(STATEDIR)/pcre.extract: $(pcre_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PCRE_DIR)) @@ -65,17 +61,8 @@ $(STATEDIR)/pcre.extract: $(pcre_extract_deps) pcre_prepare: $(STATEDIR)/pcre.prepare -# -# dependencies -# -pcre_prepare_deps = \ - $(STATEDIR)/pcre.extract \ - $(STATEDIR)/virtual-xchain.install - PCRE_PATH = PATH=$(CROSS_PATH) PCRE_ENV = $(CROSS_ENV) -#PCRE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#PCRE_ENV += # # autoconf @@ -100,8 +87,6 @@ $(STATEDIR)/pcre.prepare: $(pcre_prepare_deps_default) pcre_compile: $(STATEDIR)/pcre.compile -pcre_compile_deps = $(STATEDIR)/pcre.prepare - $(STATEDIR)/pcre.compile: $(pcre_compile_deps_default) @$(call targetinfo, $@) cd $(PCRE_DIR) && $(PCRE_ENV) $(PCRE_PATH) make @@ -124,8 +109,6 @@ $(STATEDIR)/pcre.install: $(STATEDIR)/pcre.compile pcre_targetinstall: $(STATEDIR)/pcre.targetinstall -pcre_targetinstall_deps = $(STATEDIR)/pcre.compile - $(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/pdksh.make b/rules/pdksh.make index 1a5f526b4..2b76fd93e 100644 --- a/rules/pdksh.make +++ b/rules/pdksh.make @@ -120,13 +120,6 @@ else PDKSH_AUTOCONF += --disable-brace-expand endif -# -# dependencies -# -pdksh_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/pdksh.extract - $(STATEDIR)/pdksh.prepare: $(pdksh_prepare_deps_default) @$(call targetinfo, $@) mkdir -p $(BUILDDIR)/$(PDKSH) @@ -139,11 +132,9 @@ $(STATEDIR)/pdksh.prepare: $(pdksh_prepare_deps_default) # Compile # ---------------------------------------------------------------------------- -pdksh_compile_deps = $(STATEDIR)/pdksh.prepare - pdksh_compile: $(STATEDIR)/pdksh.compile -$(STATEDIR)/pdksh.compile: $(STATEDIR)/pdksh.prepare +$(STATEDIR)/pdksh.compile: $(pdksh_compile_deps_default) @$(call targetinfo, $@) cd $(PDKSH_DIR) && $(PDKSH_PATH) make @$(call touch, $@) @@ -154,7 +145,7 @@ $(STATEDIR)/pdksh.compile: $(STATEDIR)/pdksh.prepare pdksh_install: $(STATEDIR)/pdksh.install -$(STATEDIR)/pdksh.install: $(STATEDIR)/pdksh.compile +$(STATEDIR)/pdksh.install: $(pdksh_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -164,7 +155,7 @@ $(STATEDIR)/pdksh.install: $(STATEDIR)/pdksh.compile pdksh_targetinstall: $(STATEDIR)/pdksh.targetinstall -$(STATEDIR)/pdksh.targetinstall: $(STATEDIR)/pdksh.install +$(STATEDIR)/pdksh.targetinstall: $(pdksh_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/penguzilla.make b/rules/penguzilla.make index d0f053294..17766a731 100644 --- a/rules/penguzilla.make +++ b/rules/penguzilla.make @@ -32,9 +32,7 @@ PENGUZILLA_DIR = $(BUILDDIR)/$(PENGUZILLA) penguzilla_get: $(STATEDIR)/penguzilla.get -penguzilla_get_deps = $(PENGUZILLA_SOURCE) - -$(STATEDIR)/penguzilla.get: $(penguzilla_get_deps_default) +$(STATEDIR)/penguzilla.get: $(PENGUZILLA_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(PENGUZILLA_SOURCE): penguzilla_extract: $(STATEDIR)/penguzilla.extract -penguzilla_extract_deps = $(STATEDIR)/penguzilla.get - $(STATEDIR)/penguzilla.extract: $(penguzilla_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PENGUZILLA_DIR)) @@ -63,20 +59,8 @@ $(STATEDIR)/penguzilla.extract: $(penguzilla_extract_deps) penguzilla_prepare: $(STATEDIR)/penguzilla.prepare -# -# dependencies -# -penguzilla_prepare_deps = \ - $(STATEDIR)/penguzilla.extract \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/mfirebird.install \ - $(STATEDIR)/gail.install \ - $(STATEDIR)/libxml2.install - PENGUZILLA_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) PENGUZILLA_ENV = $(CROSS_ENV) -PENGUZILLA_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig/ - # # autoconf @@ -99,8 +83,6 @@ $(STATEDIR)/penguzilla.prepare: $(penguzilla_prepare_deps_default) penguzilla_compile: $(STATEDIR)/penguzilla.compile -penguzilla_compile_deps = $(STATEDIR)/penguzilla.prepare - $(STATEDIR)/penguzilla.compile: $(penguzilla_compile_deps_default) @$(call targetinfo, $@) $(PENGUZILLA_PATH) $(PENGUZILLA_ENV) make -C $(PENGUZILLA_DIR) @@ -122,12 +104,6 @@ $(STATEDIR)/penguzilla.install: $(STATEDIR)/penguzilla.compile penguzilla_targetinstall: $(STATEDIR)/penguzilla.targetinstall -penguzilla_targetinstall_deps = \ - $(STATEDIR)/penguzilla.compile \ - $(STATEDIR)/gtk2-engines.targetinstall \ - $(STATEDIR)/gail.targetinstall \ - $(STATEDIR)/libxml2.targetinstall - $(STATEDIR)/penguzilla.targetinstall: $(penguzilla_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/php-apc.make b/rules/php-apc.make index 4ee5bade7..a5fe00c11 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -32,9 +32,7 @@ PHP_APC_DIR = $(PHP_DIR)/ext/$(PHP_APC) php-apc_get: $(STATEDIR)/php-apc.get -php-apc_get_deps = $(PHP_APC_SOURCE) - -$(STATEDIR)/php-apc.get: $(php-apc_get_deps_default) +$(STATEDIR)/php-apc.get: $(PHP_APC_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,9 +46,6 @@ $(PHP_APC_SOURCE): php-apc_extract: $(STATEDIR)/php-apc.extract -php-apc_extract_deps = $(STATEDIR)/php-apc.get \ - $(STATEDIR)/php.extract - $(STATEDIR)/php-apc.extract: $(php-apc_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PHP_APC_DIR)) @@ -64,14 +59,6 @@ $(STATEDIR)/php-apc.extract: $(php-apc_extract_deps) php-apc_prepare: $(STATEDIR)/php-apc.prepare -# -# dependencies -# -php-apc_prepare_deps = \ - $(STATEDIR)/php-apc.extract \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/php.install - PHP_APC_PATH = PATH=$(CROSS_PATH) PHP_APC_ENV = $(CROSS_ENV) @@ -98,8 +85,6 @@ $(STATEDIR)/php-apc.prepare: $(php-apc_prepare_deps_default) php-apc_compile: $(STATEDIR)/php-apc.compile -php-apc_compile_deps = $(STATEDIR)/php-apc.prepare - $(STATEDIR)/php-apc.compile: $(php-apc_compile_deps_default) @$(call targetinfo, $@) cd $(PHP_APC_DIR) && $(PHP_APC_ENV) $(PHP_APC_PATH) make @@ -122,8 +107,6 @@ $(STATEDIR)/php-apc.install: $(STATEDIR)/php-apc.compile php-apc_targetinstall: $(STATEDIR)/php-apc.targetinstall -php-apc_targetinstall_deps = $(STATEDIR)/php-apc.compile - $(STATEDIR)/php-apc.targetinstall: $(php-apc_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/php.make b/rules/php.make index 003d7aab0..f8b7f23aa 100644 --- a/rules/php.make +++ b/rules/php.make @@ -32,9 +32,7 @@ PHP_DIR = $(BUILDDIR)/$(PHP) php_get: $(STATEDIR)/php.get -php_get_deps = $(PHP_SOURCE) - -$(STATEDIR)/php.get: $(php_get_deps_default) +$(STATEDIR)/php.get: $(PHP_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(PHP_SOURCE): php_extract: $(STATEDIR)/php.extract -php_extract_deps = $(STATEDIR)/php.get - $(STATEDIR)/php.extract: $(php_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PHP_DIR)) @@ -63,17 +59,6 @@ $(STATEDIR)/php.extract: $(php_extract_deps) php_prepare: $(STATEDIR)/php.prepare -# -# dependencies -# -php_prepare_deps = \ - $(STATEDIR)/php.extract \ - $(STATEDIR)/virtual-xchain.install - -ifdef PTXCONF_PHP_APACHE -php_prepare_deps += $(STATEDIR)/apache.install -endif - PHP_PATH = PATH=$(CROSS_PATH) PHP_ENV = \ $(CROSS_ENV) \ @@ -117,8 +102,6 @@ $(STATEDIR)/php.prepare: $(php_prepare_deps_default) php_compile: $(STATEDIR)/php.compile -php_compile_deps = $(STATEDIR)/php.prepare - $(STATEDIR)/php.compile: $(php_compile_deps_default) @$(call targetinfo, $@) cd $(PHP_DIR) && $(PHP_ENV) $(PHP_PATH) make @@ -147,11 +130,6 @@ $(STATEDIR)/php.install: $(STATEDIR)/php.compile php_targetinstall: $(STATEDIR)/php.targetinstall -php_targetinstall_deps = $(STATEDIR)/php.compile -ifdef PTXCONF_APACHE -php_targetinstall_deps += $(STATEDIR)/apache.targetinstall -endif - $(STATEDIR)/php.targetinstall: $(php_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/pnet.make b/rules/pnet.make index ac2162ef1..419d42589 100644 --- a/rules/pnet.make +++ b/rules/pnet.make @@ -32,9 +32,7 @@ PNET_DIR = $(BUILDDIR)/$(PNET) pnet_get: $(STATEDIR)/pnet.get -pnet_get_deps = $(PNET_SOURCE) - -$(STATEDIR)/pnet.get: $(pnet_get_deps_default) +$(STATEDIR)/pnet.get: $(PNET_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PNET)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(PNET_SOURCE): pnet_extract: $(STATEDIR)/pnet.extract -pnet_extract_deps = $(STATEDIR)/pnet.get - $(STATEDIR)/pnet.extract: $(pnet_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PNET_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/pnet.extract: $(pnet_extract_deps) pnet_prepare: $(STATEDIR)/pnet.prepare -# -# dependencies -# -pnet_prepare_deps = \ - $(STATEDIR)/pnet.extract \ - $(STATEDIR)/treecc.install \ - $(STATEDIR)/virtual-xchain.install - PNET_PATH = PATH=$(CROSS_PATH) PNET_ENV = $(CROSS_ENV) -PNET_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -95,8 +82,6 @@ $(STATEDIR)/pnet.prepare: $(pnet_prepare_deps_default) pnet_compile: $(STATEDIR)/pnet.compile -pnet_compile_deps = $(STATEDIR)/pnet.prepare - $(STATEDIR)/pnet.compile: $(pnet_compile_deps_default) @$(call targetinfo, $@) cd $(PNET_DIR) && $(PNET_ENV) $(PNET_PATH) make @@ -118,7 +103,6 @@ $(STATEDIR)/pnet.install: $(STATEDIR)/pnet.compile # ---------------------------------------------------------------------------- pnet_targetinstall: $(STATEDIR)/pnet.targetinstall -pnet_targetinstall_deps = $(STATEDIR)/pnet.compile $(STATEDIR)/pnet.targetinstall: $(pnet_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/pnetlib.make b/rules/pnetlib.make index cf4319880..1dc85c6d9 100644 --- a/rules/pnetlib.make +++ b/rules/pnetlib.make @@ -32,8 +32,6 @@ PNETLIB_DIR = $(BUILDDIR)/$(PNETLIB) pnetlib_get: $(STATEDIR)/pnetlib.get -pnetlib_get_deps = $(PNETLIB_SOURCE) - $(STATEDIR)/pnetlib.get: $(pnetlib_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(PNETLIB)) @@ -49,8 +47,6 @@ $(PNETLIB_SOURCE): pnetlib_extract: $(STATEDIR)/pnetlib.extract -pnetlib_extract_deps = $(STATEDIR)/pnetlib.get - $(STATEDIR)/pnetlib.extract: $(pnetlib_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PNETLIB_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/pnetlib.extract: $(pnetlib_extract_deps) pnetlib_prepare: $(STATEDIR)/pnetlib.prepare -# -# dependencies -# -pnetlib_prepare_deps = \ - $(STATEDIR)/pnetlib.extract \ - $(STATEDIR)/pnet.install \ - $(STATEDIR)/virtual-xchain.install - PNETLIB_PATH = PATH=$(CROSS_PATH) PNETLIB_ENV = $(CROSS_ENV) -PNETLIB_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -95,8 +82,6 @@ $(STATEDIR)/pnetlib.prepare: $(pnetlib_prepare_deps_default) pnetlib_compile: $(STATEDIR)/pnetlib.compile -pnetlib_compile_deps = $(STATEDIR)/pnetlib.prepare - $(STATEDIR)/pnetlib.compile: $(pnetlib_compile_deps_default) @$(call targetinfo, $@) cd $(PNETLIB_DIR) && $(PNETLIB_ENV) $(PNETLIB_PATH) make @@ -119,8 +104,6 @@ $(STATEDIR)/pnetlib.install: $(STATEDIR)/pnetlib.compile pnetlib_targetinstall: $(STATEDIR)/pnetlib.targetinstall -pnetlib_targetinstall_deps = $(STATEDIR)/pnetlib.compile - $(STATEDIR)/pnetlib.targetinstall: $(pnetlib_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/pop3spam.make b/rules/pop3spam.make index 580aade42..046d3578e 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -32,8 +32,6 @@ POP3SPAM_DIR = $(BUILDDIR)/$(POP3SPAM) pop3spam_get: $(STATEDIR)/pop3spam.get -pop3spam_get_deps = $(POP3SPAM_SOURCE) - $(STATEDIR)/pop3spam.get: $(pop3spam_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(POP3SPAM_SOURCE): pop3spam_extract: $(STATEDIR)/pop3spam.extract -pop3spam_extract_deps = $(STATEDIR)/pop3spam.get - $(STATEDIR)/pop3spam.extract: $(pop3spam_extract_deps) @$(call targetinfo, $@) @$(call clean, $(POP3SPAM_DIR)) @@ -63,17 +59,8 @@ $(STATEDIR)/pop3spam.extract: $(pop3spam_extract_deps) pop3spam_prepare: $(STATEDIR)/pop3spam.prepare -# -# dependencies -# -pop3spam_prepare_deps = $(STATEDIR)/pop3spam.extract -pop3spam_prepare_deps += $(STATEDIR)/virtual-xchain.install -pop3spam_prepare_deps += $(STATEDIR)/pcre.install - POP3SPAM_PATH = PATH=$(CROSS_PATH) POP3SPAM_ENV = $(CROSS_ENV) -#POP3SPAM_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#POP3SPAM_ENV += # # autoconf diff --git a/rules/popt.make b/rules/popt.make index bde3967b9..71a6969eb 100644 --- a/rules/popt.make +++ b/rules/popt.make @@ -34,9 +34,7 @@ POPT_DIR = $(BUILDDIR)/$(POPT) popt_get: $(STATEDIR)/popt.get -popt_get_deps = $(POPT_SOURCE) - -$(STATEDIR)/popt.get: $(popt_get_deps_default) +$(STATEDIR)/popt.get: $(POPT_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -50,8 +48,6 @@ $(POPT_SOURCE): popt_extract: $(STATEDIR)/popt.extract -popt_extract_deps = $(STATEDIR)/popt.get - $(STATEDIR)/popt.extract: $(popt_extract_deps) @$(call targetinfo, $@) @$(call clean, $(POPT_DIR)) @@ -65,13 +61,6 @@ $(STATEDIR)/popt.extract: $(popt_extract_deps) popt_prepare: $(STATEDIR)/popt.prepare -# -# dependencies -# -popt_prepare_deps = \ - $(STATEDIR)/popt.extract \ - $(STATEDIR)/virtual-xchain.install - POPT_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) POPT_ENV = $(CROSS_ENV) @@ -98,8 +87,6 @@ $(STATEDIR)/popt.prepare: $(popt_prepare_deps_default) popt_compile: $(STATEDIR)/popt.compile -popt_compile_deps = $(STATEDIR)/popt.prepare - $(STATEDIR)/popt.compile: $(popt_compile_deps_default) @$(call targetinfo, $@) cd $(POPT_DIR) && $(POPT_PATH) make @@ -122,8 +109,6 @@ $(STATEDIR)/popt.install: $(STATEDIR)/popt.compile popt_targetinstall: $(STATEDIR)/popt.targetinstall -popt_targetinstall_deps = $(STATEDIR)/popt.compile - $(STATEDIR)/popt.targetinstall: $(popt_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/portmap.make b/rules/portmap.make index 97537573e..db64bfb4d 100644 --- a/rules/portmap.make +++ b/rules/portmap.make @@ -67,13 +67,6 @@ endif portmap_prepare: $(STATEDIR)/portmap.prepare -portmap_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install -ifdef PTXCONF_TCPWRAPPER -portmap_prepare_deps += $(STATEDIR)/tcpwrapper.install -endif -portmap_prepare_deps += $(STATEDIR)/portmap.extract - $(STATEDIR)/portmap.prepare: $(portmap_prepare_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -91,7 +84,7 @@ ifdef PTXCONF_TCPWRAPPER PORTMAP_MAKEVARS = WRAP_DIR=$(CROSS_LIB_DIR)/lib endif -$(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare +$(STATEDIR)/portmap.compile: $(portmap_compile_deps_default) @$(call targetinfo, $@) cd $(PORTMAP_DIR) && \ $(PORTMAP_ENV) $(PORTMAP_PATH) make $(PORTMAP_MAKEVARS) @@ -103,7 +96,7 @@ $(STATEDIR)/portmap.compile: $(STATEDIR)/portmap.prepare portmap_install: $(STATEDIR)/portmap.install -$(STATEDIR)/portmap.install: $(STATEDIR)/portmap.compile +$(STATEDIR)/portmap.install: $(portmap_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -113,7 +106,7 @@ $(STATEDIR)/portmap.install: $(STATEDIR)/portmap.compile portmap_targetinstall: $(STATEDIR)/portmap.targetinstall -$(STATEDIR)/portmap.targetinstall: $(STATEDIR)/portmap.install +$(STATEDIR)/portmap.targetinstall: $(portmap_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/pppd.make b/rules/pppd.make index ed19a47bf..dfd38ece5 100644 --- a/rules/pppd.make +++ b/rules/pppd.make @@ -31,9 +31,7 @@ PPP_DIR = $(BUILDDIR)/$(PPP) ppp_get: $(STATEDIR)/ppp.get -ppp_get_deps = $(PPP_SOURCE) - -$(STATEDIR)/ppp.get: $(ppp_get_deps_default) +$(STATEDIR)/ppp.get: $(PPP_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PPP)) @$(call touch, $@) @@ -108,8 +106,6 @@ endif ppp_compile: $(STATEDIR)/ppp.compile -ppp_compile_deps = $(STATEDIR)/ppp.prepare - $(STATEDIR)/ppp.compile: $(ppp_compile_deps_default) @$(call targetinfo, $@) cd $(PPP_DIR) && \ @@ -122,7 +118,7 @@ $(STATEDIR)/ppp.compile: $(ppp_compile_deps_default) ppp_install: $(STATEDIR)/ppp.install -$(STATEDIR)/ppp.install: $(STATEDIR)/ppp.compile +$(STATEDIR)/ppp.install: $(ppp_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -132,7 +128,7 @@ $(STATEDIR)/ppp.install: $(STATEDIR)/ppp.compile ppp_targetinstall: $(STATEDIR)/ppp.targetinstall -$(STATEDIR)/ppp.targetinstall: $(STATEDIR)/ppp.compile +$(STATEDIR)/ppp.targetinstall: $(ppp_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/procps.make b/rules/procps.make index 299221206..06618874a 100644 --- a/rules/procps.make +++ b/rules/procps.make @@ -32,9 +32,7 @@ PROCPS_DIR = $(BUILDDIR)/$(PROCPS) procps_get: $(STATEDIR)/procps.get -procps_get_deps = $(PROCPS_SOURCE) - -$(STATEDIR)/procps.get: $(procps_get_deps_default) +$(STATEDIR)/procps.get: $(PROCPS_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PROCPS)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(PROCPS_SOURCE): procps_extract: $(STATEDIR)/procps.extract -procps_extract_deps = $(STATEDIR)/procps.get - $(STATEDIR)/procps.extract: $(procps_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PROCPS_DIR)) @@ -64,14 +60,6 @@ $(STATEDIR)/procps.extract: $(procps_extract_deps) procps_prepare: $(STATEDIR)/procps.prepare -# -# dependencies -# -procps_prepare_deps = \ - $(STATEDIR)/procps.extract \ - $(STATEDIR)/ncurses.install \ - $(STATEDIR)/virtual-xchain.install - PROCPS_PATH = PATH=$(CROSS_PATH) PROCPS_MAKEVARS = $(CROSS_ENV) PROCPS_MAKEVARS += CFLAGS="-I$(subst $(quote),,$(PTXCONF_PREFIX))/$(subst $(quote),,$(PTXCONF_GNU_TARGET))/include -I$(subst $(quote),,$(PROCPS_DIR))" @@ -93,8 +81,6 @@ $(STATEDIR)/procps.prepare: $(procps_prepare_deps_default) procps_compile: $(STATEDIR)/procps.compile -procps_compile_deps = $(STATEDIR)/procps.prepare - $(STATEDIR)/procps.compile: $(procps_compile_deps_default) @$(call targetinfo, $@) @@ -124,7 +110,7 @@ endif procps_install: $(STATEDIR)/procps.install -$(STATEDIR)/procps.install: $(STATEDIR)/procps.compile +$(STATEDIR)/procps.install: $(procps_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -134,10 +120,6 @@ $(STATEDIR)/procps.install: $(STATEDIR)/procps.compile procps_targetinstall: $(STATEDIR)/procps.targetinstall -procps_targetinstall_deps = \ - $(STATEDIR)/procps.compile \ - $(STATEDIR)/ncurses.targetinstall - $(STATEDIR)/procps.targetinstall: $(procps_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/proftpd.make b/rules/proftpd.make index a3200e563..e288cec37 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -48,7 +48,7 @@ $(PROFTPD_SOURCE): proftpd_extract: $(STATEDIR)/proftpd.extract -$(STATEDIR)/proftpd.extract: $(STATEDIR)/proftpd.get +$(STATEDIR)/proftpd.extract: $(proftpd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PROFTPD_DIR)) @$(call extract, $(PROFTPD_SOURCE)) @@ -95,7 +95,7 @@ proftpd_extract_deps = \ $(STATEDIR)/virtual-xchain.install \ $(STATEDIR)/proftpd.extract -$(STATEDIR)/proftpd.prepare: $(proftpd_extract_deps) +$(STATEDIR)/proftpd.prepare: $(proftpd_prepare_deps_default) @$(call targetinfo, $@) cd $(PROFTPD_DIR) && \ $(PROFTPD_PATH) $(PROFTPD_ENV) \ @@ -108,7 +108,7 @@ $(STATEDIR)/proftpd.prepare: $(proftpd_extract_deps) proftpd_compile: $(STATEDIR)/proftpd.compile -$(STATEDIR)/proftpd.compile: $(STATEDIR)/proftpd.prepare +$(STATEDIR)/proftpd.compile: $(proftpd_compile_deps_default) @$(call targetinfo, $@) cd $(PROFTPD_DIR) && $(PROFTPD_PATH) $(PROFTPD_ENV) make $(PROFTPD_MAKEVARS) @$(call touch, $@) @@ -119,7 +119,7 @@ $(STATEDIR)/proftpd.compile: $(STATEDIR)/proftpd.prepare proftpd_install: $(STATEDIR)/proftpd.install -$(STATEDIR)/proftpd.install: $(STATEDIR)/proftpd.compile +$(STATEDIR)/proftpd.install: $(proftpd_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -129,7 +129,7 @@ $(STATEDIR)/proftpd.install: $(STATEDIR)/proftpd.compile proftpd_targetinstall: $(STATEDIR)/proftpd.targetinstall -$(STATEDIR)/proftpd.targetinstall: $(STATEDIR)/proftpd.install +$(STATEDIR)/proftpd.targetinstall: $(proftpd_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/pureftpd.make b/rules/pureftpd.make index 712034c8e..394273655 100644 --- a/rules/pureftpd.make +++ b/rules/pureftpd.make @@ -32,9 +32,7 @@ PUREFTPD_DIR = $(BUILDDIR)/$(PUREFTPD) pureftpd_get: $(STATEDIR)/pureftpd.get -pureftpd_get_deps = $(PUREFTPD_SOURCE) - -$(STATEDIR)/pureftpd.get: $(pureftpd_get_deps_default) +$(STATEDIR)/pureftpd.get: $(PUREFTPD_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PUREFTPD)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(PUREFTPD_SOURCE): pureftpd_extract: $(STATEDIR)/pureftpd.extract -pureftpd_extract_deps = $(STATEDIR)/pureftpd.get - $(STATEDIR)/pureftpd.extract: $(pureftpd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PUREFTPD_DIR)) @@ -64,16 +60,8 @@ $(STATEDIR)/pureftpd.extract: $(pureftpd_extract_deps) pureftpd_prepare: $(STATEDIR)/pureftpd.prepare -# -# dependencies -# -pureftpd_prepare_deps = \ - $(STATEDIR)/pureftpd.extract \ - $(STATEDIR)/virtual-xchain.install - PUREFTPD_PATH = PATH=$(CROSS_PATH) PUREFTPD_ENV = $(CROSS_ENV) -PUREFTPD_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig PUREFTPD_ENV += ac_cv_func_snprintf=yes # @@ -135,8 +123,6 @@ $(STATEDIR)/pureftpd.prepare: $(pureftpd_prepare_deps_default) pureftpd_compile: $(STATEDIR)/pureftpd.compile -pureftpd_compile_deps = $(STATEDIR)/pureftpd.prepare - $(STATEDIR)/pureftpd.compile: $(pureftpd_compile_deps_default) @$(call targetinfo, $@) cd $(PUREFTPD_DIR) && $(PUREFTPD_ENV) $(PUREFTPD_PATH) make @@ -159,8 +145,6 @@ $(STATEDIR)/pureftpd.install: $(STATEDIR)/pureftpd.compile pureftpd_targetinstall: $(STATEDIR)/pureftpd.targetinstall -pureftpd_targetinstall_deps = $(STATEDIR)/pureftpd.compile - $(STATEDIR)/pureftpd.targetinstall: $(pureftpd_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/python.make b/rules/python.make index a2b596b7b..5c55b9559 100644 --- a/rules/python.make +++ b/rules/python.make @@ -33,10 +33,7 @@ PYTHON_BUILDDIR = $(PYTHON_DIR)-build python_get: $(STATEDIR)/python.get -python_get_deps = \ - $(PYTHON_SOURCE) - -$(STATEDIR)/python.get: $(python_get_deps_default) +$(STATEDIR)/python.get: $(PYTHON_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PYTHON)) @$(call touch, $@) @@ -51,9 +48,6 @@ $(PYTHON_SOURCE): python_extract: $(STATEDIR)/python.extract -python_extract_deps = \ - $(STATEDIR)/python.get - $(STATEDIR)/python.extract: $(python_extract_deps) @$(call targetinfo, $@) @$(call clean, $(PYTHON_DIR)) @@ -67,13 +61,6 @@ $(STATEDIR)/python.extract: $(python_extract_deps) python_prepare: $(STATEDIR)/python.prepare -# -# dependencies -# -python_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/python.extract - PYTHON_PATH = PATH=$(CROSS_PATH) PYTHON_ENV = $(CROSS_ENV) @@ -100,10 +87,6 @@ $(STATEDIR)/python.prepare: $(python_prepare_deps_default) python_compile: $(STATEDIR)/python.compile -python_compile_deps = \ - $(STATEDIR)/xchain-python.compile \ - $(STATEDIR)/python.prepare - $(STATEDIR)/python.compile: $(python_compile_deps_default) @$(call targetinfo, $@) $(PYTHON_PATH) make -C $(PYTHON_BUILDDIR) $(PYTHON_MAKEVARS) @@ -115,7 +98,7 @@ $(STATEDIR)/python.compile: $(python_compile_deps_default) python_install: $(STATEDIR)/python.install -$(STATEDIR)/python.install: +$(STATEDIR)/python.install: $(python_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -125,7 +108,7 @@ $(STATEDIR)/python.install: python_targetinstall: $(STATEDIR)/python.targetinstall -$(STATEDIR)/python.targetinstall: $(STATEDIR)/python.compile +$(STATEDIR)/python.targetinstall: $(python_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/python24.make b/rules/python24.make index bc52d997f..9f5dfe3eb 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -33,10 +33,7 @@ PYTHON24_BUILDDIR = $(PYTHON24_DIR)-build python24_get: $(STATEDIR)/python24.get -python24_get_deps = \ - $(PYTHON24_SOURCE) - -$(STATEDIR)/python24.get: $(python24_get_deps_default) +$(STATEDIR)/python24.get: $(PYTHON24_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(PYTHON24)) @$(call touch, $@) @@ -51,10 +48,7 @@ $(PYTHON24_SOURCE): python24_extract: $(STATEDIR)/python24.extract -python24_extract_deps = \ - $(STATEDIR)/python24.get - -$(STATEDIR)/python24.extract: $(python24_extract_deps) +$(STATEDIR)/python24.extract: $(python24_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PYTHON24_DIR)) @$(call extract, $(PYTHON24_SOURCE)) @@ -67,13 +61,6 @@ $(STATEDIR)/python24.extract: $(python24_extract_deps) python24_prepare: $(STATEDIR)/python24.prepare -# -# dependencies -# -python24_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/python24.extract - PYTHON24_PATH = PATH=$(CROSS_PATH) PYTHON24_ENV = $(CROSS_ENV) @@ -100,10 +87,6 @@ $(STATEDIR)/python24.prepare: $(python24_prepare_deps_default) python24_compile: $(STATEDIR)/python24.compile -python24_compile_deps = \ - $(STATEDIR)/xchain-python24.compile \ - $(STATEDIR)/python24.prepare - $(STATEDIR)/python24.compile: $(python24_compile_deps_default) @$(call targetinfo, $@) cd $(PYTHON24_BUILDDIR) && $(PYTHON24_PATH) make $(PYTHON24_MAKEVARS) @@ -115,7 +98,7 @@ $(STATEDIR)/python24.compile: $(python24_compile_deps_default) python24_install: $(STATEDIR)/python24.install -$(STATEDIR)/python24.install: +$(STATEDIR)/python24.install: $(python24_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -125,7 +108,7 @@ $(STATEDIR)/python24.install: python24_targetinstall: $(STATEDIR)/python24.targetinstall -$(STATEDIR)/python24.targetinstall: $(STATEDIR)/python24.compile +$(STATEDIR)/python24.targetinstall: $(python24_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/qt.make b/rules/qt.make index 2fcc3f48f..8acd509e9 100644 --- a/rules/qt.make +++ b/rules/qt.make @@ -34,9 +34,7 @@ QT_DIR = $(BUILDDIR)/qt-$(QT_VERSION) qt_get: $(STATEDIR)/qt.get -qt_get_deps = $(QT_SOURCE) - -$(STATEDIR)/qt.get: $(qt_get_deps_default) +$(STATEDIR)/qt.get: $(QT_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -50,8 +48,6 @@ $(QT_SOURCE): qt_extract: $(STATEDIR)/qt.extract -qt_extract_deps = $(STATEDIR)/qt.get - $(STATEDIR)/qt.extract: $(qt_extract_deps) @$(call targetinfo, $@) @$(call clean, $(QT_DIR)) @@ -65,13 +61,6 @@ $(STATEDIR)/qt.extract: $(qt_extract_deps) qt_prepare: $(STATEDIR)/qt.prepare -# -# dependencies -# -qt_prepare_deps = \ - $(STATEDIR)/qt.extract \ - $(STATEDIR)/virtual-xchain.install - QT_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) QT_ENV = $(CROSS_ENV) QT_ENV += QTDIR=$(QT_DIR) @@ -112,8 +101,6 @@ $(STATEDIR)/qt.prepare: $(qt_prepare_deps_default) qt_compile: $(STATEDIR)/qt.compile -qt_compile_deps = $(STATEDIR)/qt.prepare - $(STATEDIR)/qt.compile: $(qt_compile_deps_default) @$(call targetinfo, $@) $(QT_PATH) $(QT_ENV) make -C $(QT_DIR) @@ -136,8 +123,6 @@ $(STATEDIR)/qt.install: $(STATEDIR)/qt.compile qt_targetinstall: $(STATEDIR)/qt.targetinstall -qt_targetinstall_deps = $(STATEDIR)/qt.compile - $(STATEDIR)/qt.targetinstall: $(qt_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/qte.make b/rules/qte.make index 447491a47..28c1d9080 100644 --- a/rules/qte.make +++ b/rules/qte.make @@ -38,9 +38,7 @@ QTDIR = $(BUILDDIR)/$(QTE) qte_get: $(STATEDIR)/qte.get -qte_get_deps = $(QTE_SOURCE) - -$(STATEDIR)/qte.get: $(qte_get_deps_default) +$(STATEDIR)/qte.get: $(QTE_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -54,8 +52,6 @@ $(QTE_SOURCE): qte_extract: $(STATEDIR)/qte.extract -qte_extract_deps = $(STATEDIR)/qte.get - $(STATEDIR)/qte.extract: $(qte_extract_deps) @$(call targetinfo, $@) @$(call clean, $(QTE_DIR)) @@ -69,14 +65,6 @@ $(STATEDIR)/qte.extract: $(qte_extract_deps) qte_prepare: $(STATEDIR)/qte.prepare -# -# dependencies -# -qte_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/host-qte.install \ - $(STATEDIR)/qte.extract - QTE_PATH = PATH=$(CROSS_PATH) # QTE_ENV = $(CROSS_ENV) QTE_ENV += QTDIR=/opt @@ -118,7 +106,6 @@ QTE_AUTOCONF += -disable-sql QTE_AUTOCONF += -disable-workspace ifdef PTXCONF_QTE_TSLIB QTE_AUTOCONF += -qt-mouse-tslib -qte_prepare_deps += $(STATEDIR)/tslib.install endif ifdef PTXCONF_QTE_SHARED @@ -219,8 +206,6 @@ $(STATEDIR)/qte.prepare: $(qte_prepare_deps_default) qte_compile: $(STATEDIR)/qte.compile -qte_compile_deps = $(STATEDIR)/qte.prepare - $(STATEDIR)/qte.compile: $(qte_compile_deps_default) @$(call targetinfo, $@) cp -f $(PTXCONF_PREFIX)/bin/uic $(QTE_DIR)/bin/uic @@ -233,7 +218,7 @@ $(STATEDIR)/qte.compile: $(qte_compile_deps_default) qte_install: $(STATEDIR)/qte.install -$(STATEDIR)/qte.install: $(STATEDIR)/qte.compile +$(STATEDIR)/qte.install: $(qte_install_deps_default) @$(call targetinfo, $@) @$(call install, QTE) @$(call touch, $@) @@ -244,8 +229,6 @@ $(STATEDIR)/qte.install: $(STATEDIR)/qte.compile qte_targetinstall: $(STATEDIR)/qte.targetinstall -qte_targetinstall_deps = $(STATEDIR)/qte.compile - $(STATEDIR)/qte.targetinstall: $(qte_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/rawrec.make b/rules/rawrec.make index d8f421ee3..f771035ad 100644 --- a/rules/rawrec.make +++ b/rules/rawrec.make @@ -32,8 +32,6 @@ RAWREC_DIR = $(BUILDDIR)/$(RAWREC) rawrec_get: $(STATEDIR)/rawrec.get -rawrec_get_deps = $(RAWREC_SOURCE) - $(STATEDIR)/rawrec.get: $(rawrec_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(RAWREC)) @@ -49,8 +47,6 @@ $(RAWREC_SOURCE): rawrec_extract: $(STATEDIR)/rawrec.extract -rawrec_extract_deps = $(STATEDIR)/rawrec.get - $(STATEDIR)/rawrec.extract: $(rawrec_extract_deps) @$(call targetinfo, $@) @$(call clean, $(RAWREC_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/rawrec.extract: $(rawrec_extract_deps) rawrec_prepare: $(STATEDIR)/rawrec.prepare -# -# dependencies -# -rawrec_prepare_deps = \ - $(STATEDIR)/rawrec.extract \ - $(STATEDIR)/virtual-xchain.install - RAWREC_PATH = PATH=$(CROSS_PATH) RAWREC_ENV = $(CROSS_ENV) -#RAWREC_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#RAWREC_ENV += # # autoconf @@ -91,8 +78,6 @@ $(STATEDIR)/rawrec.prepare: $(rawrec_prepare_deps_default) rawrec_compile: $(STATEDIR)/rawrec.compile -rawrec_compile_deps = $(STATEDIR)/rawrec.prepare - # CC=$(CROSS_CC) to override Makefile's "CC = gcc" $(STATEDIR)/rawrec.compile: $(rawrec_compile_deps_default) @$(call targetinfo, $@) @@ -120,8 +105,6 @@ $(STATEDIR)/rawrec.install: $(STATEDIR)/rawrec.compile rawrec_targetinstall: $(STATEDIR)/rawrec.targetinstall -rawrec_targetinstall_deps = $(STATEDIR)/rawrec.compile - $(STATEDIR)/rawrec.targetinstall: $(rawrec_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/readline.make b/rules/readline.make index 868f454b6..4a859dccb 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -32,11 +32,8 @@ READLINE_DIR = $(BUILDDIR)/$(READLINE) readline_get: $(STATEDIR)/readline.get -readline_get_deps = $(READLINE_SOURCE) - -$(STATEDIR)/readline.get: $(readline_get_deps_default) +$(STATEDIR)/readline.get: $(READLINE_SOURCE) @$(call targetinfo, $@) -# @$(call get_patches, $(READLINE)) @$(call touch, $@) $(READLINE_SOURCE): @@ -49,8 +46,6 @@ $(READLINE_SOURCE): readline_extract: $(STATEDIR)/readline.extract -readline_extract_deps = $(STATEDIR)/readline.get - $(STATEDIR)/readline.extract: $(readline_extract_deps) @$(call targetinfo, $@) @$(call clean, $(READLINE_DIR)) @@ -64,18 +59,8 @@ $(STATEDIR)/readline.extract: $(readline_extract_deps) readline_prepare: $(STATEDIR)/readline.prepare -# -# dependencies -# -readline_prepare_deps = \ - $(STATEDIR)/readline.extract \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/ncurses.install - READLINE_PATH = PATH=$(CROSS_PATH) READLINE_ENV = $(CROSS_ENV) -#READLINE_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#READLINE_ENV += # # autoconf @@ -96,8 +81,6 @@ $(STATEDIR)/readline.prepare: $(readline_prepare_deps_default) readline_compile: $(STATEDIR)/readline.compile -readline_compile_deps = $(STATEDIR)/readline.prepare - $(STATEDIR)/readline.compile: $(readline_compile_deps_default) @$(call targetinfo, $@) cd $(READLINE_DIR) && $(READLINE_ENV) $(READLINE_PATH) make @@ -120,8 +103,6 @@ $(STATEDIR)/readline.install: $(STATEDIR)/readline.compile readline_targetinstall: $(STATEDIR)/readline.targetinstall -readline_targetinstall_deps = $(STATEDIR)/readline.compile - $(STATEDIR)/readline.targetinstall: $(readline_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/realvnc.make b/rules/realvnc.make index 626c05e6c..3bc1340f4 100644 --- a/rules/realvnc.make +++ b/rules/realvnc.make @@ -35,9 +35,7 @@ REALVNC_DIR = $(BUILDDIR)/$(REALVNC) realvnc_get: $(STATEDIR)/realvnc.get -realvnc_get_deps = $(REALVNC_SOURCE) - -$(STATEDIR)/realvnc.get: $(realvnc_get_deps_default) +$(STATEDIR)/realvnc.get: $(REALVNC_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(REALVNC)) @$(call touch, $@) @@ -52,8 +50,6 @@ $(REALVNC_SOURCE): realvnc_extract: $(STATEDIR)/realvnc.extract -realvnc_extract_deps = $(STATEDIR)/realvnc.get - $(STATEDIR)/realvnc.extract: $(realvnc_extract_deps) @$(call targetinfo, $@) @$(call clean, $(REALVNC_DIR)) @@ -67,17 +63,8 @@ $(STATEDIR)/realvnc.extract: $(realvnc_extract_deps) realvnc_prepare: $(STATEDIR)/realvnc.prepare -# -# dependencies -# -realvnc_prepare_deps = $(STATEDIR)/realvnc.extract -realvnc_prepare_deps += $(STATEDIR)/virtual-xchain.install -realvnc_prepare_deps += $(STATEDIR)/xlibs-xtst.install - REALVNC_PATH = PATH=$(CROSS_PATH) REALVNC_ENV = $(CROSS_ENV) -#REALVNC_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#REALVNC_ENV += # # autoconf @@ -103,8 +90,6 @@ $(STATEDIR)/realvnc.prepare: $(realvnc_prepare_deps_default) realvnc_compile: $(STATEDIR)/realvnc.compile -realvnc_compile_deps = $(STATEDIR)/realvnc.prepare - $(STATEDIR)/realvnc.compile: $(realvnc_compile_deps_default) @$(call targetinfo, $@) cd $(REALVNC_DIR) && $(REALVNC_ENV) $(REALVNC_PATH) make @@ -116,7 +101,7 @@ $(STATEDIR)/realvnc.compile: $(realvnc_compile_deps_default) realvnc_install: $(STATEDIR)/realvnc.install -$(STATEDIR)/realvnc.install: $(STATEDIR)/realvnc.compile +$(STATEDIR)/realvnc.install: $(realvnc_install_deps_default) @$(call targetinfo, $@) @$(call install, REALVNC) @$(call touch, $@) @@ -127,9 +112,6 @@ $(STATEDIR)/realvnc.install: $(STATEDIR)/realvnc.compile realvnc_targetinstall: $(STATEDIR)/realvnc.targetinstall -realvnc_targetinstall_deps = $(STATEDIR)/realvnc.compile -realvnc_targetinstall_deps += $(STATEDIR)/xlibs-xtst.targetinstall - $(STATEDIR)/realvnc.targetinstall: $(realvnc_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/rsync.make b/rules/rsync.make index 23fa53d49..81face220 100644 --- a/rules/rsync.make +++ b/rules/rsync.make @@ -32,9 +32,7 @@ RSYNC_DIR = $(BUILDDIR)/$(RSYNC) rsync_get: $(STATEDIR)/rsync.get -rsync_get_deps = $(RSYNC_SOURCE) - -$(STATEDIR)/rsync.get: $(rsync_get_deps_default) +$(STATEDIR)/rsync.get: $(RSYNC_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(RSYNC_SOURCE): rsync_extract: $(STATEDIR)/rsync.extract -rsync_extract_deps = $(STATEDIR)/rsync.get - $(STATEDIR)/rsync.extract: $(rsync_extract_deps) @$(call targetinfo, $@) @$(call clean, $(RSYNC_DIR)) @@ -63,13 +59,6 @@ $(STATEDIR)/rsync.extract: $(rsync_extract_deps) rsync_prepare: $(STATEDIR)/rsync.prepare -# -# dependencies -# -rsync_prepare_deps = \ - $(STATEDIR)/rsync.extract \ - $(STATEDIR)/virtual-xchain.install - RSYNC_PATH = PATH=$(CROSS_PATH) RSYNC_ENV = rsync_cv_HAVE_GETTIMEOFDAY_TZ=yes $(CROSS_ENV) @@ -95,8 +84,6 @@ $(STATEDIR)/rsync.prepare: $(rsync_prepare_deps_default) rsync_compile: $(STATEDIR)/rsync.compile -rsync_compile_deps = $(STATEDIR)/rsync.prepare - $(STATEDIR)/rsync.compile: $(rsync_compile_deps_default) @$(call targetinfo, $@) $(RSYNC_PATH) make -C $(RSYNC_DIR) @@ -108,7 +95,7 @@ $(STATEDIR)/rsync.compile: $(rsync_compile_deps_default) rsync_install: $(STATEDIR)/rsync.install -$(STATEDIR)/rsync.install: $(STATEDIR)/rsync.compile +$(STATEDIR)/rsync.install: $(rsync_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -118,8 +105,6 @@ $(STATEDIR)/rsync.install: $(STATEDIR)/rsync.compile rsync_targetinstall: $(STATEDIR)/rsync.targetinstall -rsync_targetinstall_deps = $(STATEDIR)/rsync.compile - $(STATEDIR)/rsync.targetinstall: $(rsync_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/rtai.make b/rules/rtai.make index 5a78afd86..ac2d1e0e8 100644 --- a/rules/rtai.make +++ b/rules/rtai.make @@ -74,11 +74,6 @@ RTAI_ENV = \ LINUXDIR=$(KERNEL_DIR) \ MAKE='make $(KERNEL_MAKEVARS)' -rtai_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/kernel.prepare \ - $(STATEDIR)/rtai.extract - RTAI_AUTOCONF = $(CROSS_AUTOCONF_USR) RTAI_AUTOCONF += \ --with-kconfig-file=$(RTAI_DIR)/.config \ @@ -100,7 +95,7 @@ $(STATEDIR)/rtai.prepare: $(rtai_prepare_deps_default) rtai_compile: $(STATEDIR)/rtai.compile -$(STATEDIR)/rtai.compile: $(STATEDIR)/rtai.prepare +$(STATEDIR)/rtai.compile: $(rtai_compile_deps_default) @$(call targetinfo, $@) cd $(RTAI_DIR) && $(RTAI_PATH) TOPDIR=$(RTAI_DIR) make @$(call touch, $@) @@ -111,7 +106,7 @@ $(STATEDIR)/rtai.compile: $(STATEDIR)/rtai.prepare rtai_install: $(STATEDIR)/rtai.install -$(STATEDIR)/rtai.install: $(STATEDIR)/rtai.compile +$(STATEDIR)/rtai.install: $(rtai_install_deps_default) @$(call targetinfo, $@) # RTAI tries to install all kinds of useless crap which we don't # want to have on the target, so install into a build dir here @@ -124,7 +119,7 @@ $(STATEDIR)/rtai.install: $(STATEDIR)/rtai.compile rtai_targetinstall: $(STATEDIR)/rtai.targetinstall -$(STATEDIR)/rtai.targetinstall: $(STATEDIR)/rtai.install +$(STATEDIR)/rtai.targetinstall: $(rtai_targetinstall_deps_default) @$(call targetinfo, $@) install -d $(RTAI_MODULEDIR)/rtai diff --git a/rules/rtnet.make b/rules/rtnet.make index fa61dacef..bf6d22489 100644 --- a/rules/rtnet.make +++ b/rules/rtnet.make @@ -35,9 +35,7 @@ RTNET_MODULEDIR = $(ROOTDIR)/lib/modules/$(KERNEL_VERSION)-adeos/kernel/drivers rtnet_get: $(STATEDIR)/rtnet.get -rtnet_get_deps = $(RTNET_SOURCE) - -$(STATEDIR)/rtnet.get: $(rtnet_get_deps_default) +$(STATEDIR)/rtnet.get: $(RTNET_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -51,8 +49,6 @@ $(RTNET_SOURCE): rtnet_extract: $(STATEDIR)/rtnet.extract -rtnet_extract_deps = $(STATEDIR)/rtnet.get - $(STATEDIR)/rtnet.extract: $(rtnet_extract_deps) @$(call targetinfo, $@) @$(call clean, $(RTNET_DIR)) @@ -66,16 +62,6 @@ $(STATEDIR)/rtnet.extract: $(rtnet_extract_deps) rtnet_prepare: $(STATEDIR)/rtnet.prepare -# -# dependencies -# -rtnet_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/kernel-modversions.prepare \ - $(STATEDIR)/rtai.prepare \ - $(STATEDIR)/ncurses.install \ - $(STATEDIR)/rtnet.extract - RTNET_PATH = PATH=$(CROSS_PATH) RTNET_ENV = $(CROSS_ENV) @@ -195,8 +181,6 @@ $(STATEDIR)/rtnet.prepare: $(rtnet_prepare_deps_default) rtnet_compile: $(STATEDIR)/rtnet.compile -rtnet_compile_deps = $(STATEDIR)/rtnet.prepare - $(STATEDIR)/rtnet.compile: $(rtnet_compile_deps_default) @$(call targetinfo, $@) cd $(RTNET_DIR) && $(RTNET_PATH) make @@ -208,7 +192,7 @@ $(STATEDIR)/rtnet.compile: $(rtnet_compile_deps_default) rtnet_install: $(STATEDIR)/rtnet.install -$(STATEDIR)/rtnet.install: $(STATEDIR)/rtnet.compile +$(STATEDIR)/rtnet.install: $(rtnet_install_deps_default) @$(call targetinfo, $@) # FIXME # @$(call install, RTNET) @@ -221,8 +205,6 @@ $(STATEDIR)/rtnet.install: $(STATEDIR)/rtnet.compile rtnet_targetinstall: $(STATEDIR)/rtnet.targetinstall -rtnet_targetinstall_deps = $(STATEDIR)/rtnet.compile - $(STATEDIR)/rtnet.targetinstall: $(rtnet_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/setmixer.make b/rules/setmixer.make index ef872708f..803b70af0 100644 --- a/rules/setmixer.make +++ b/rules/setmixer.make @@ -32,9 +32,7 @@ SETMIXER_DIR = $(BUILDDIR)/setmixer-27DEC94ds1.orig setmixer_get: $(STATEDIR)/setmixer.get -setmixer_get_deps = $(SETMIXER_SOURCE) - -$(STATEDIR)/setmixer.get: $(setmixer_get_deps_default) +$(STATEDIR)/setmixer.get: $(SETMIXER_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(SETMIXER_SOURCE): setmixer_extract: $(STATEDIR)/setmixer.extract -setmixer_extract_deps = $(STATEDIR)/setmixer.get - $(STATEDIR)/setmixer.extract: $(setmixer_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SETMIXER_DIR)) @@ -63,13 +59,6 @@ $(STATEDIR)/setmixer.extract: $(setmixer_extract_deps) setmixer_prepare: $(STATEDIR)/setmixer.prepare -# -# dependencies -# -setmixer_prepare_deps = \ - $(STATEDIR)/setmixer.extract \ - $(STATEDIR)/virtual-xchain.install - SETMIXER_PATH = PATH=$(CROSS_PATH) SETMIXER_ENV = $(CROSS_ENV) SETMIXER_MAKEVARS = CC=$(PTXCONF_GNU_TARGET)-gcc @@ -85,8 +74,6 @@ $(STATEDIR)/setmixer.prepare: $(setmixer_prepare_deps_default) setmixer_compile: $(STATEDIR)/setmixer.compile -setmixer_compile_deps = $(STATEDIR)/setmixer.prepare - $(STATEDIR)/setmixer.compile: $(setmixer_compile_deps_default) @$(call targetinfo, $@) cd $(SETMIXER_DIR) && \ @@ -109,8 +96,6 @@ $(STATEDIR)/setmixer.install: $(STATEDIR)/setmixer.compile setmixer_targetinstall: $(STATEDIR)/setmixer.targetinstall -setmixer_targetinstall_deps = $(STATEDIR)/setmixer.compile - $(STATEDIR)/setmixer.targetinstall: $(setmixer_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/setserial.make b/rules/setserial.make index 2207cf576..ff7af0a9c 100644 --- a/rules/setserial.make +++ b/rules/setserial.make @@ -32,9 +32,7 @@ SETSERIAL_DIR = $(BUILDDIR)/$(SETSERIAL) setserial_get: $(STATEDIR)/setserial.get -setserial_get_deps = $(SETSERIAL_SOURCE) - -$(STATEDIR)/setserial.get: $(setserial_get_deps_default) +$(STATEDIR)/setserial.get: $(SETSERIAL_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(SETSERIAL_SOURCE): setserial_extract: $(STATEDIR)/setserial.extract -setserial_extract_deps = $(STATEDIR)/setserial.get - $(STATEDIR)/setserial.extract: $(setserial_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SETSERIAL_DIR)) @@ -63,16 +59,8 @@ $(STATEDIR)/setserial.extract: $(setserial_extract_deps) setserial_prepare: $(STATEDIR)/setserial.prepare -# -# dependencies -# -setserial_prepare_deps = \ - $(STATEDIR)/setserial.extract \ - $(STATEDIR)/virtual-xchain.install - SETSERIAL_PATH = PATH=$(CROSS_PATH) SETSERIAL_ENV = $(CROSS_ENV) -SETSERIAL_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -93,8 +81,6 @@ $(STATEDIR)/setserial.prepare: $(setserial_prepare_deps_default) setserial_compile: $(STATEDIR)/setserial.compile -setserial_compile_deps = $(STATEDIR)/setserial.prepare - $(STATEDIR)/setserial.compile: $(setserial_compile_deps_default) @$(call targetinfo, $@) cd $(SETSERIAL_DIR) && $(SETSERIAL_ENV) $(SETSERIAL_PATH) make @@ -117,8 +103,6 @@ $(STATEDIR)/setserial.install: $(STATEDIR)/setserial.compile setserial_targetinstall: $(STATEDIR)/setserial.targetinstall -setserial_targetinstall_deps = $(STATEDIR)/setserial.compile - $(STATEDIR)/setserial.targetinstall: $(setserial_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/shorewall.make b/rules/shorewall.make index 8e1e2552c..1aa47c410 100644 --- a/rules/shorewall.make +++ b/rules/shorewall.make @@ -33,9 +33,7 @@ SHOREWALL_DIR = $(BUILDDIR)/$(SHOREWALL) shorewall_get: $(STATEDIR)/shorewall.get -shorewall_get_deps = $(SHOREWALL_SOURCE) - -$(STATEDIR)/shorewall.get: $(shorewall_get_deps_default) +$(STATEDIR)/shorewall.get: $(SHOREWALL_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -49,9 +47,7 @@ $(SHOREWALL_SOURCE): shorewall_extract: $(STATEDIR)/shorewall.extract -shorewall_extract_deps = $(STATEDIR)/shorewall.get - -$(STATEDIR)/shorewall.extract: $(shorewall_extract_deps) +$(STATEDIR)/shorewall.extract: $(shorewall_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SHOREWALL_DIR)) @$(call extract, $(SHOREWALL_SOURCE)) @@ -64,7 +60,7 @@ $(STATEDIR)/shorewall.extract: $(shorewall_extract_deps) shorewall_prepare: $(STATEDIR)/shorewall.prepare -$(STATEDIR)/shorewall.prepare: +$(STATEDIR)/shorewall.prepare: $(shorewall_prepare_deps_default @$(call targetinfo, $@) @$(call touch, $@) @@ -74,7 +70,7 @@ $(STATEDIR)/shorewall.prepare: shorewall_compile: $(STATEDIR)/shorewall.compile -$(STATEDIR)/shorewall.compile: +$(STATEDIR)/shorewall.compile: $(shorewall_compile_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -84,8 +80,6 @@ $(STATEDIR)/shorewall.compile: shorewall_targetinstall: $(STATEDIR)/shorewall.targetinstall -shorewall_targetinstall_deps = $(STATEDIR)/shorewall.extract - # # create /etc/shorewall directory before installing to keep it from # using build system's chkconfig script to install itself! diff --git a/rules/slang.make b/rules/slang.make index 503ce0dd3..8f9abd675 100644 --- a/rules/slang.make +++ b/rules/slang.make @@ -32,9 +32,7 @@ SLANG_DIR = $(BUILDDIR)/$(SLANG) slang_get: $(STATEDIR)/slang.get -slang_get_deps = $(SLANG_SOURCE) - -$(STATEDIR)/slang.get: $(slang_get_deps_default) +$(STATEDIR)/slang.get: $(SLANG_URL) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(SLANG_SOURCE): slang_extract: $(STATEDIR)/slang.extract -slang_extract_deps = $(STATEDIR)/slang.get - $(STATEDIR)/slang.extract: $(slang_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SLANG_DIR)) @@ -63,16 +59,8 @@ $(STATEDIR)/slang.extract: $(slang_extract_deps) slang_prepare: $(STATEDIR)/slang.prepare -# -# dependencies -# -slang_prepare_deps = \ - $(STATEDIR)/slang.extract \ - $(STATEDIR)/virtual-xchain.install - SLANG_PATH = PATH=$(CROSS_PATH) SLANG_ENV = $(CROSS_ENV) -#SLANG_ENV += # # autoconf @@ -93,8 +81,6 @@ $(STATEDIR)/slang.prepare: $(slang_prepare_deps_default) slang_compile: $(STATEDIR)/slang.compile -slang_compile_deps = $(STATEDIR)/slang.prepare - $(STATEDIR)/slang.compile: $(slang_compile_deps_default) @$(call targetinfo, $@) cd $(SLANG_DIR) && $(SLANG_PATH) make elf @@ -106,7 +92,7 @@ $(STATEDIR)/slang.compile: $(slang_compile_deps_default) slang_install: $(STATEDIR)/slang.install -$(STATEDIR)/slang.install: $(STATEDIR)/slang.compile +$(STATEDIR)/slang.install: $(slang_compile_deps_default) @$(call targetinfo, $@) @$(call install, SLANG) @$(call touch, $@) @@ -117,8 +103,6 @@ $(STATEDIR)/slang.install: $(STATEDIR)/slang.compile slang_targetinstall: $(STATEDIR)/slang.targetinstall -slang_targetinstall_deps = $(STATEDIR)/slang.compile - $(STATEDIR)/slang.targetinstall: $(slang_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/smtpclient.make b/rules/smtpclient.make index 97b466c3d..73ba1a6a1 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -32,9 +32,7 @@ SMTPCLIENT_DIR = $(BUILDDIR)/$(SMTPCLIENT) smtpclient_get: $(STATEDIR)/smtpclient.get -smtpclient_get_deps = $(SMTPCLIENT_SOURCE) - -$(STATEDIR)/smtpclient.get: $(smtpclient_get_deps_default) +$(STATEDIR)/smtpclient.get: $(SMTPCLIENT_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(SMTPCLIENT)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(SMTPCLIENT_SOURCE): smtpclient_extract: $(STATEDIR)/smtpclient.extract -smtpclient_extract_deps = $(STATEDIR)/smtpclient.get - $(STATEDIR)/smtpclient.extract: $(smtpclient_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SMTPCLIENT_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/smtpclient.extract: $(smtpclient_extract_deps) smtpclient_prepare: $(STATEDIR)/smtpclient.prepare -# -# dependencies -# -smtpclient_prepare_deps = \ - $(STATEDIR)/smtpclient.extract \ - $(STATEDIR)/virtual-xchain.install - SMTPCLIENT_PATH = PATH=$(CROSS_PATH) SMTPCLIENT_ENV = $(CROSS_ENV) -#SMTPCLIENT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#SMTPCLIENT_ENV += # # autoconf @@ -95,8 +82,6 @@ $(STATEDIR)/smtpclient.prepare: $(smtpclient_prepare_deps_default) smtpclient_compile: $(STATEDIR)/smtpclient.compile -smtpclient_compile_deps = $(STATEDIR)/smtpclient.prepare - $(STATEDIR)/smtpclient.compile: $(smtpclient_compile_deps_default) @$(call targetinfo, $@) cd $(SMTPCLIENT_DIR) && $(SMTPCLIENT_ENV) $(SMTPCLIENT_PATH) make @@ -119,8 +104,6 @@ $(STATEDIR)/smtpclient.install: $(STATEDIR)/smtpclient.compile smtpclient_targetinstall: $(STATEDIR)/smtpclient.targetinstall -smtpclient_targetinstall_deps = $(STATEDIR)/smtpclient.compile - $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/sqlite.make b/rules/sqlite.make index 6e93ead7e..b41266757 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -33,9 +33,7 @@ SQLITE_DIR = $(BUILDDIR)/$(SQLITE) sqlite_get: $(STATEDIR)/sqlite.get -sqlite_get_deps = $(SQLITE_SOURCE) - -$(STATEDIR)/sqlite.get: $(sqlite_get_deps_default) +$(STATEDIR)/sqlite.get: $(SQLITE_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -49,9 +47,7 @@ $(SQLITE_SOURCE): sqlite_extract: $(STATEDIR)/sqlite.extract -sqlite_extract_deps = $(STATEDIR)/sqlite.get - -$(STATEDIR)/sqlite.extract: $(sqlite_extract_deps) +$(STATEDIR)/sqlite.extract: $(sqlite_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(SQLITE_DIR)) @$(call extract, $(SQLITE_SOURCE)) @@ -64,13 +60,6 @@ $(STATEDIR)/sqlite.extract: $(sqlite_extract_deps) sqlite_prepare: $(STATEDIR)/sqlite.prepare -# -# dependencies -# -sqlite_prepare_deps = \ - $(STATEDIR)/sqlite.extract \ - $(STATEDIR)/virtual-xchain.install - SQLITE_PATH = PATH=$(CROSS_PATH) SQLITE_ENV = $(CROSS_ENV) SQLITE_MK = $(SQLITE_DIR)/Makefile.PTXdist @@ -121,8 +110,6 @@ $(STATEDIR)/sqlite.prepare: $(sqlite_prepare_deps_default) sqlite_compile: $(STATEDIR)/sqlite.compile -sqlite_compile_deps = $(STATEDIR)/sqlite.prepare - $(STATEDIR)/sqlite.compile: $(sqlite_compile_deps_default) @$(call targetinfo, $@) cd $(SQLITE_DIR) && $(SQLITE_PATH) make -f $(SQLITE_MK) libsqlite @@ -134,7 +121,7 @@ $(STATEDIR)/sqlite.compile: $(sqlite_compile_deps_default) sqlite_install: $(STATEDIR)/sqlite.install -$(STATEDIR)/sqlite.install: $(STATEDIR)/sqlite.compile +$(STATEDIR)/sqlite.install: $(sqlite_install_deps_default) @$(call targetinfo, $@) install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/include install -d $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/lib @@ -152,7 +139,7 @@ $(STATEDIR)/sqlite.install: $(STATEDIR)/sqlite.compile sqlite_targetinstall: $(STATEDIR)/sqlite.targetinstall -$(STATEDIR)/sqlite.targetinstall: $(STATEDIR)/sqlite.install +$(STATEDIR)/sqlite.targetinstall: $(sqlite_targetinstall_deps_default) @$(call targetinfo, $@) install -d $(ROOTDIR)/usr/lib diff --git a/rules/ssmtp.make b/rules/ssmtp.make index 5bd3d8a01..f7a849e63 100644 --- a/rules/ssmtp.make +++ b/rules/ssmtp.make @@ -38,8 +38,6 @@ SSMTP_PATCH_SOURCE = $(SRCDIR)/$(SSMTP_PATCH_SRC) ssmtp_get: $(STATEDIR)/ssmtp.get -ssmtp_get_deps = $(SSMTP_SOURCE) $(SSMTP_PATCH_SOURCE) - $(STATEDIR)/ssmtp.get: $(ssmtp_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -58,8 +56,6 @@ $(SSMTP_PATCH_SOURCE): ssmtp_extract: $(STATEDIR)/ssmtp.extract -ssmtp_extract_deps = $(STATEDIR)/ssmtp.get - $(STATEDIR)/ssmtp.extract: $(ssmtp_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SSMTP_DIR)) @@ -74,13 +70,6 @@ $(STATEDIR)/ssmtp.extract: $(ssmtp_extract_deps) ssmtp_prepare: $(STATEDIR)/ssmtp.prepare -# -# dependencies -# -ssmtp_prepare_deps = \ - $(STATEDIR)/ssmtp.extract \ - $(STATEDIR)/virtual-xchain.install - SSMTP_PATH = PATH=$(CROSS_PATH) SSMTP_ENV = $(CROSS_ENV) @@ -119,8 +108,6 @@ $(STATEDIR)/ssmtp.prepare: $(ssmtp_prepare_deps_default) ssmtp_compile: $(STATEDIR)/ssmtp.compile -ssmtp_compile_deps = $(STATEDIR)/ssmtp.prepare - $(STATEDIR)/ssmtp.compile: $(ssmtp_compile_deps_default) @$(call targetinfo, $@) cd $(SSMTP_DIR) && $(SSMTP_ENV) $(SSMTP_PATH) make @@ -145,8 +132,6 @@ $(STATEDIR)/ssmtp.install: $(STATEDIR)/ssmtp.compile ssmtp_targetinstall: $(STATEDIR)/ssmtp.targetinstall -ssmtp_targetinstall_deps = $(STATEDIR)/ssmtp.compile - $(STATEDIR)/ssmtp.targetinstall: $(ssmtp_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/strace.make b/rules/strace.make index 678954178..f0d20f965 100644 --- a/rules/strace.make +++ b/rules/strace.make @@ -46,9 +46,6 @@ $(STRACE_SOURCE): strace_extract: $(STATEDIR)/strace.extract -strace_extract_deps = \ - $(STATEDIR)/strace.get - $(STATEDIR)/strace.extract: $(strace_extract_deps) @$(call targetinfo, $@) @$(call clean, $(STRACE_DIR)) @@ -62,10 +59,6 @@ $(STATEDIR)/strace.extract: $(strace_extract_deps) strace_prepare: $(STATEDIR)/strace.prepare -strace_prepare_deps = \ - $(STATEDIR)/strace.extract \ - $(STATEDIR)/virtual-xchain.install - STRACE_PATH = PATH=$(CROSS_PATH) STRACE_ENV = $(CROSS_ENV) @@ -91,7 +84,7 @@ $(STATEDIR)/strace.prepare: $(strace_prepare_deps_default) strace_compile: $(STATEDIR)/strace.compile -$(STATEDIR)/strace.compile: $(STATEDIR)/strace.prepare +$(STATEDIR)/strace.compile: $(strace_compile_deps_default) @$(call targetinfo, $@) $(STRACE_PATH) $(STRACE_ENV) make -C $(STRACE_DIR) @$(call touch, $@) @@ -102,7 +95,7 @@ $(STATEDIR)/strace.compile: $(STATEDIR)/strace.prepare strace_install: $(STATEDIR)/strace.install -$(STATEDIR)/strace.install: $(STATEDIR)/strace.compile +$(STATEDIR)/strace.install: $(strace_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -112,7 +105,7 @@ $(STATEDIR)/strace.install: $(STATEDIR)/strace.compile strace_targetinstall: $(STATEDIR)/strace.targetinstall -$(STATEDIR)/strace.targetinstall: $(STATEDIR)/strace.compile +$(STATEDIR)/strace.targetinstall: $(strace_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/sudo.make b/rules/sudo.make index 6a7358072..66094965a 100644 --- a/rules/sudo.make +++ b/rules/sudo.make @@ -34,9 +34,7 @@ SUDO_DIR = $(BUILDDIR)/$(SUDO) sudo_get: $(STATEDIR)/sudo.get -sudo_get_deps = $(SUDO_SOURCE) - -$(STATEDIR)/sudo.get: $(sudo_get_deps_default) +$(STATEDIR)/sudo.get: $(SUDO_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(SUDO)) @$(call touch, $@) @@ -51,8 +49,6 @@ $(SUDO_SOURCE): sudo_extract: $(STATEDIR)/sudo.extract -sudo_extract_deps = $(STATEDIR)/sudo.get - $(STATEDIR)/sudo.extract: $(sudo_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SUDO_DIR)) @@ -66,17 +62,8 @@ $(STATEDIR)/sudo.extract: $(sudo_extract_deps) sudo_prepare: $(STATEDIR)/sudo.prepare -# -# dependencies -# -sudo_prepare_deps = \ - $(STATEDIR)/sudo.extract \ - $(STATEDIR)/virtual-xchain.install - SUDO_PATH = PATH=$(CROSS_PATH) SUDO_ENV = $(CROSS_ENV) -#SUDO_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#SUDO_ENV += # # autoconf @@ -97,8 +84,6 @@ $(STATEDIR)/sudo.prepare: $(sudo_prepare_deps_default) sudo_compile: $(STATEDIR)/sudo.compile -sudo_compile_deps = $(STATEDIR)/sudo.prepare - $(STATEDIR)/sudo.compile: $(sudo_compile_deps_default) @$(call targetinfo, $@) cd $(SUDO_DIR) && $(SUDO_ENV) $(SUDO_PATH) make @@ -121,8 +106,6 @@ $(STATEDIR)/sudo.install: $(STATEDIR)/sudo.compile sudo_targetinstall: $(STATEDIR)/sudo.targetinstall -sudo_targetinstall_deps = $(STATEDIR)/sudo.compile - $(STATEDIR)/sudo.targetinstall: $(sudo_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index ef2f305bd..52fab40c7 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -32,9 +32,7 @@ SYSFSUTILS_DIR = $(BUILDDIR)/$(SYSFSUTILS) sysfsutils_get: $(STATEDIR)/sysfsutils.get -sysfsutils_get_deps = $(SYSFSUTILS_SOURCE) - -$(STATEDIR)/sysfsutils.get: $(sysfsutils_get_deps_default) +$(STATEDIR)/sysfsutils.get: $(SYSFSUTILS_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(SYSFSUTILS)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(SYSFSUTILS_SOURCE): sysfsutils_extract: $(STATEDIR)/sysfsutils.extract -sysfsutils_extract_deps = $(STATEDIR)/sysfsutils.get - $(STATEDIR)/sysfsutils.extract: $(sysfsutils_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SYSFSUTILS_DIR)) @@ -64,13 +60,6 @@ $(STATEDIR)/sysfsutils.extract: $(sysfsutils_extract_deps) sysfsutils_prepare: $(STATEDIR)/sysfsutils.prepare -# -# dependencies -# -sysfsutils_prepare_deps = \ - $(STATEDIR)/sysfsutils.extract \ - $(STATEDIR)/virtual-xchain.install - SYSFSUTILS_PATH = PATH=$(CROSS_PATH) SYSFSUTILS_ENV = $(CROSS_ENV) @@ -93,8 +82,6 @@ $(STATEDIR)/sysfsutils.prepare: $(sysfsutils_prepare_deps_default) sysfsutils_compile: $(STATEDIR)/sysfsutils.compile -sysfsutils_compile_deps = $(STATEDIR)/sysfsutils.prepare - $(STATEDIR)/sysfsutils.compile: $(sysfsutils_compile_deps_default) @$(call targetinfo, $@) cd $(SYSFSUTILS_DIR) && $(SYSFSUTILS_ENV) $(SYSFSUTILS_PATH) make @@ -117,8 +104,6 @@ $(STATEDIR)/sysfsutils.install: $(STATEDIR)/sysfsutils.compile sysfsutils_targetinstall: $(STATEDIR)/sysfsutils.targetinstall -sysfsutils_targetinstall_deps = $(STATEDIR)/sysfsutils.compile - $(STATEDIR)/sysfsutils.targetinstall: $(sysfsutils_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/sysutils.make b/rules/sysutils.make index b2b6ec32e..8c72c82a4 100644 --- a/rules/sysutils.make +++ b/rules/sysutils.make @@ -32,8 +32,6 @@ SYSUTILS_DIR = $(BUILDDIR)/$(SYSUTILS) sysutils_get: $(STATEDIR)/sysutils.get -sysutils_get_deps = $(SYSUTILS_SOURCE) - $(STATEDIR)/sysutils.get: $(sysutils_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(SYSUTILS)) @@ -49,8 +47,6 @@ $(SYSUTILS_SOURCE): sysutils_extract: $(STATEDIR)/sysutils.extract -sysutils_extract_deps = $(STATEDIR)/sysutils.get - $(STATEDIR)/sysutils.extract: $(sysutils_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SYSUTILS_DIR)) @@ -64,13 +60,6 @@ $(STATEDIR)/sysutils.extract: $(sysutils_extract_deps) sysutils_prepare: $(STATEDIR)/sysutils.prepare -# -# dependencies -# -sysutils_prepare_deps = \ - $(STATEDIR)/sysutils.extract \ - $(STATEDIR)/virtual-xchain.install - SYSUTILS_PATH = PATH=$(CROSS_PATH) SYSUTILS_ENV = $(CROSS_ENV) @@ -84,8 +73,6 @@ $(STATEDIR)/sysutils.prepare: $(sysutils_prepare_deps_default) sysutils_compile: $(STATEDIR)/sysutils.compile -sysutils_compile_deps = $(STATEDIR)/sysutils.prepare - $(STATEDIR)/sysutils.compile: $(sysutils_compile_deps_default) @$(call targetinfo, $@) cd $(SYSUTILS_DIR) && $(SYSUTILS_ENV) $(SYSUTILS_PATH) make @@ -107,8 +94,6 @@ $(STATEDIR)/sysutils.install: $(STATEDIR)/sysutils.compile sysutils_targetinstall: $(STATEDIR)/sysutils.targetinstall -sysutils_targetinstall_deps = $(STATEDIR)/sysutils.compile - $(STATEDIR)/sysutils.targetinstall: $(sysutils_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/sysvinit.make b/rules/sysvinit.make index 8941f0fac..44598896c 100644 --- a/rules/sysvinit.make +++ b/rules/sysvinit.make @@ -37,9 +37,7 @@ BSDINIT_DIR = $(BUILDDIR)/bsdinit-1.0 sysvinit_get: $(STATEDIR)/sysvinit.get -sysvinit_get_deps = $(SYSVINIT_SOURCE) - -$(STATEDIR)/sysvinit.get: $(sysvinit_get_deps_default) +$(STATEDIR)/sysvinit.get: $(SYSVINIT_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -53,8 +51,6 @@ $(SYSVINIT_SOURCE): sysvinit_extract: $(STATEDIR)/sysvinit.extract -sysvinit_extract_deps = $(STATEDIR)/sysvinit.get - $(STATEDIR)/sysvinit.extract: $(sysvinit_extract_deps) @$(call targetinfo, $@) @$(call clean, $(SYSVINIT_DIR)) @@ -68,16 +64,8 @@ $(STATEDIR)/sysvinit.extract: $(sysvinit_extract_deps) sysvinit_prepare: $(STATEDIR)/sysvinit.prepare -# -# dependencies -# -sysvinit_prepare_deps = \ - $(STATEDIR)/sysvinit.extract \ - $(STATEDIR)/virtual-xchain.install - SYSVINIT_PATH = PATH=$(CROSS_PATH) SYSVINIT_ENV = $(CROSS_ENV) -SYSVINIT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -99,8 +87,6 @@ $(STATEDIR)/sysvinit.prepare: $(sysvinit_prepare_deps_default) sysvinit_compile: $(STATEDIR)/sysvinit.compile -sysvinit_compile_deps = $(STATEDIR)/sysvinit.prepare - $(STATEDIR)/sysvinit.compile: $(sysvinit_compile_deps_default) @$(call targetinfo, $@) cd $(SYSVINIT_DIR)/src && \ @@ -123,8 +109,6 @@ $(STATEDIR)/sysvinit.install: $(STATEDIR)/sysvinit.compile sysvinit_targetinstall: $(STATEDIR)/sysvinit.targetinstall -sysvinit_targetinstall_deps = $(STATEDIR)/sysvinit.compile - $(STATEDIR)/sysvinit.targetinstall: $(sysvinit_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/tcpdump.make b/rules/tcpdump.make index 7746dc1f6..63e4584c3 100644 --- a/rules/tcpdump.make +++ b/rules/tcpdump.make @@ -36,7 +36,6 @@ tcpdump_get_deps = $(TCPDUMP_SOURCE) $(STATEDIR)/tcpdump.get: $(tcpdump_get_deps_default) @$(call targetinfo, $@) - @$(call get_patches, $(TCPDUMP)) @$(call touch, $@) $(TCPDUMP_SOURCE): @@ -49,8 +48,6 @@ $(TCPDUMP_SOURCE): tcpdump_extract: $(STATEDIR)/tcpdump.extract -tcpdump_extract_deps = $(STATEDIR)/tcpdump.get - $(STATEDIR)/tcpdump.extract: $(tcpdump_extract_deps) @$(call targetinfo, $@) @$(call clean, $(TCPDUMP_DIR)) @@ -64,18 +61,8 @@ $(STATEDIR)/tcpdump.extract: $(tcpdump_extract_deps) tcpdump_prepare: $(STATEDIR)/tcpdump.prepare -# -# dependencies -# -tcpdump_prepare_deps = \ - $(STATEDIR)/tcpdump.extract \ - $(STATEDIR)/libpcap.install \ - $(STATEDIR)/virtual-xchain.install - TCPDUMP_PATH = PATH=$(CROSS_PATH) TCPDUMP_ENV = $(CROSS_ENV) -#TCPDUMP_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#TCPDUMP_ENV += # # autoconf @@ -103,8 +90,6 @@ $(STATEDIR)/tcpdump.prepare: $(tcpdump_prepare_deps_default) tcpdump_compile: $(STATEDIR)/tcpdump.compile -tcpdump_compile_deps = $(STATEDIR)/tcpdump.prepare - $(STATEDIR)/tcpdump.compile: $(tcpdump_compile_deps_default) @$(call targetinfo, $@) cd $(TCPDUMP_DIR) && $(TCPDUMP_ENV) $(TCPDUMP_PATH) make @@ -116,7 +101,7 @@ $(STATEDIR)/tcpdump.compile: $(tcpdump_compile_deps_default) tcpdump_install: $(STATEDIR)/tcpdump.install -$(STATEDIR)/tcpdump.install: $(STATEDIR)/tcpdump.compile +$(STATEDIR)/tcpdump.install: $(tcpdump_install_deps_default) @$(call targetinfo, $@) @$(call install, TCPDUMP) @$(call touch, $@) @@ -127,9 +112,6 @@ $(STATEDIR)/tcpdump.install: $(STATEDIR)/tcpdump.compile tcpdump_targetinstall: $(STATEDIR)/tcpdump.targetinstall -tcpdump_targetinstall_deps = $(STATEDIR)/tcpdump.compile \ - $(STATEDIR)/libpcap.install - $(STATEDIR)/tcpdump.targetinstall: $(tcpdump_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/tcpwrapper.make b/rules/tcpwrapper.make index 4a2e9dbdb..b4da5a942 100644 --- a/rules/tcpwrapper.make +++ b/rules/tcpwrapper.make @@ -45,7 +45,7 @@ $(TCPWRAPPER_SOURCE): tcpwrapper_extract: $(STATEDIR)/tcpwrapper.extract -$(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get +$(STATEDIR)/tcpwrapper.extract: $(tcpwrapper_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(TCPWRAPPER_DIR)) @$(call extract, $(TCPWRAPPER_SOURCE)) @@ -58,7 +58,7 @@ $(STATEDIR)/tcpwrapper.extract: $(STATEDIR)/tcpwrapper.get tcpwrapper_prepare: $(STATEDIR)/tcpwrapper.prepare -$(STATEDIR)/tcpwrapper.prepare: $(STATEDIR)/virtual-xchain.install $(STATEDIR)/tcpwrapper.extract +$(STATEDIR)/tcpwrapper.prepare: $(tcpwrapper_prepare_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -71,7 +71,7 @@ tcpwrapper_compile: $(STATEDIR)/tcpwrapper.compile TCPWRAPPER_ENV = $(CROSS_ENV) TCPWRAPPER_PATH = PATH=$(CROSS_PATH) -$(STATEDIR)/tcpwrapper.compile: $(STATEDIR)/tcpwrapper.prepare +$(STATEDIR)/tcpwrapper.compile: $(tcpwrapper_compile_deps_default) @$(call targetinfo, $@) $(TCPWRAPPER_PATH) $(TCPWRAPPER_ENV) \ make -C $(TCPWRAPPER_DIR) linux @@ -83,7 +83,7 @@ $(STATEDIR)/tcpwrapper.compile: $(STATEDIR)/tcpwrapper.prepare tcpwrapper_install: $(STATEDIR)/tcpwrapper.install -$(STATEDIR)/tcpwrapper.install: $(STATEDIR)/tcpwrapper.compile +$(STATEDIR)/tcpwrapper.install: $(tcpwrapper_install_deps_default) @$(call targetinfo, $@) install -d $(CROSS_LIB_DIR)/lib install $(TCPWRAPPER_DIR)/libwrap.a $(CROSS_LIB_DIR)/lib @@ -95,7 +95,7 @@ $(STATEDIR)/tcpwrapper.install: $(STATEDIR)/tcpwrapper.compile tcpwrapper_targetinstall: $(STATEDIR)/tcpwrapper.targetinstall -$(STATEDIR)/tcpwrapper.targetinstall: $(STATEDIR)/tcpwrapper.install +$(STATEDIR)/tcpwrapper.targetinstall: $(tcpwrapper_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/termcap.make b/rules/termcap.make index 0cd2f3753..492f0dbb7 100644 --- a/rules/termcap.make +++ b/rules/termcap.make @@ -32,19 +32,10 @@ TERMCAP_DIR = $(BUILDDIR)/$(TERMCAP) termcap_get: $(STATEDIR)/termcap.get -termcap_get_deps = \ - $(TERMCAP_SOURCE) \ - $(STATEDIR)/termcap-patches.get - -$(STATEDIR)/termcap.get: $(termcap_get_deps_default) +$(STATEDIR)/termcap.get: $(TERMCAP_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) -$(STATEDIR)/termcap-patches.get: - @$(call targetinfo, $@) - @$(call get_patches, $(TERMCAP)) - @$(call touch, $@) - $(TERMCAP_SOURCE): @$(call targetinfo, $@) @$(call get, $(TERMCAP_URL)) @@ -55,8 +46,6 @@ $(TERMCAP_SOURCE): termcap_extract: $(STATEDIR)/termcap.extract -termcap_extract_deps = $(STATEDIR)/termcap.get - $(STATEDIR)/termcap.extract: $(termcap_extract_deps) @$(call targetinfo, $@) @$(call clean, $(TERMCAP_DIR)) @@ -70,13 +59,6 @@ $(STATEDIR)/termcap.extract: $(termcap_extract_deps) termcap_prepare: $(STATEDIR)/termcap.prepare -# -# dependencies -# -termcap_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/termcap.extract - TERMCAP_PATH = PATH=$(CROSS_PATH) TERMCAP_ENV = $(CROSS_ENV) @@ -99,8 +81,6 @@ $(STATEDIR)/termcap.prepare: $(termcap_prepare_deps_default) termcap_compile: $(STATEDIR)/termcap.compile -termcap_compile_deps = $(STATEDIR)/termcap.prepare - $(STATEDIR)/termcap.compile: $(termcap_compile_deps_default) @$(call targetinfo, $@) cd $(TERMCAP_DIR) && $(TERMCAP_PATH) make @@ -112,7 +92,7 @@ $(STATEDIR)/termcap.compile: $(termcap_compile_deps_default) termcap_install: $(STATEDIR)/termcap.install -$(STATEDIR)/termcap.install: $(STATEDIR)/termcap.compile +$(STATEDIR)/termcap.install: $(termcap_install_deps_default) @$(call targetinfo, $@) @$(call install, TERMCAP) @$(call touch, $@) @@ -123,8 +103,6 @@ $(STATEDIR)/termcap.install: $(STATEDIR)/termcap.compile termcap_targetinstall: $(STATEDIR)/termcap.targetinstall -termcap_targetinstall_deps = $(STATEDIR)/termcap.install - $(STATEDIR)/termcap.targetinstall: $(termcap_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/thttpd.make b/rules/thttpd.make index 7069a4c82..608bd4dac 100644 --- a/rules/thttpd.make +++ b/rules/thttpd.make @@ -32,9 +32,7 @@ THTTPD_DIR = $(BUILDDIR)/$(THTTPD) thttpd_get: $(STATEDIR)/thttpd.get -thttpd_get_deps = $(THTTPD_SOURCE) - -$(STATEDIR)/thttpd.get: $(thttpd_get_deps_default) +$(STATEDIR)/thttpd.get: $(THTTPD_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(THTTPD_SOURCE): thttpd_extract: $(STATEDIR)/thttpd.extract -thttpd_extract_deps = $(STATEDIR)/thttpd.get - $(STATEDIR)/thttpd.extract: $(thttpd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(THTTPD_DIR)) @@ -63,16 +59,8 @@ $(STATEDIR)/thttpd.extract: $(thttpd_extract_deps) thttpd_prepare: $(STATEDIR)/thttpd.prepare -# -# dependencies -# -thttpd_prepare_deps = \ - $(STATEDIR)/thttpd.extract \ - $(STATEDIR)/virtual-xchain.install - THTTPD_PATH = PATH=$(CROSS_PATH) THTTPD_ENV = $(CROSS_ENV) -#THTTPD_ENV += # # autoconf @@ -93,8 +81,6 @@ $(STATEDIR)/thttpd.prepare: $(thttpd_prepare_deps_default) thttpd_compile: $(STATEDIR)/thttpd.compile -thttpd_compile_deps = $(STATEDIR)/thttpd.prepare - $(STATEDIR)/thttpd.compile: $(thttpd_compile_deps_default) @$(call targetinfo, $@) $(THTTPD_PATH) make -C $(THTTPD_DIR) @@ -117,8 +103,6 @@ $(STATEDIR)/thttpd.install: $(STATEDIR)/thttpd.compile thttpd_targetinstall: $(STATEDIR)/thttpd.targetinstall -thttpd_targetinstall_deps = $(STATEDIR)/thttpd.compile - $(STATEDIR)/thttpd.targetinstall: $(thttpd_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/tinylogin.make b/rules/tinylogin.make index d496e57b3..b4ff600ec 100644 --- a/rules/tinylogin.make +++ b/rules/tinylogin.make @@ -33,8 +33,6 @@ TINYLOGIN_DIR = $(BUILDDIR)/$(TINYLOGIN) tinylogin_get: $(STATEDIR)/tinylogin.get -tinylogin_get_deps = $(TINYLOGIN_SOURCE) - $(STATEDIR)/tinylogin.get: $(tinylogin_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -65,13 +63,6 @@ tinylogin_prepare: $(STATEDIR)/tinylogin.prepare TINYLOGIN_PATH = PATH=$(CROSS_PATH) TINYLOGIN_MAKEVARS = CROSS=$(PTXCONF_GNU_TARGET)- -# -# dependencies -# -tinylogin_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/tinylogin.extract - $(STATEDIR)/tinylogin.prepare: $(tinylogin_prepare_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -82,8 +73,6 @@ $(STATEDIR)/tinylogin.prepare: $(tinylogin_prepare_deps_default) tinylogin_compile: $(STATEDIR)/tinylogin.compile -tinylogin_compile_deps = $(STATEDIR)/tinylogin.prepare - $(STATEDIR)/tinylogin.compile: $(tinylogin_compile_deps_default) @$(call targetinfo, $@) cd $(TINYLOGIN_DIR) && $(TINYLOGIN_PATH) make $(TINYLOGIN_MAKEVARS) @@ -95,7 +84,7 @@ $(STATEDIR)/tinylogin.compile: $(tinylogin_compile_deps_default) tinylogin_install: $(STATEDIR)/tinylogin.install -$(STATEDIR)/tinylogin.install: $(STATEDIR)/tinylogin.compile +$(STATEDIR)/tinylogin.install: $(tinylogin_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -105,7 +94,7 @@ $(STATEDIR)/tinylogin.install: $(STATEDIR)/tinylogin.compile tinylogin_targetinstall: $(STATEDIR)/tinylogin.targetinstall -$(STATEDIR)/tinylogin.targetinstall: $(STATEDIR)/tinylogin.install +$(STATEDIR)/tinylogin.targetinstall: $(tinylogin_targetinstall_deps_default @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/treecc.make b/rules/treecc.make index e9529baee..2b692f0b5 100644 --- a/rules/treecc.make +++ b/rules/treecc.make @@ -32,9 +32,7 @@ TREECC_DIR = $(BUILDDIR)/$(TREECC) treecc_get: $(STATEDIR)/treecc.get -treecc_get_deps = $(TREECC_SOURCE) - -$(STATEDIR)/treecc.get: $(treecc_get_deps_default) +$(STATEDIR)/treecc.get: $(TREECC_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(TREECC)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(TREECC_SOURCE): treecc_extract: $(STATEDIR)/treecc.extract -treecc_extract_deps = $(STATEDIR)/treecc.get - $(STATEDIR)/treecc.extract: $(treecc_extract_deps) @$(call targetinfo, $@) @$(call clean, $(TREECC_DIR)) @@ -64,16 +60,8 @@ $(STATEDIR)/treecc.extract: $(treecc_extract_deps) treecc_prepare: $(STATEDIR)/treecc.prepare -# -# dependencies -# -treecc_prepare_deps = \ - $(STATEDIR)/treecc.extract \ - $(STATEDIR)/virtual-xchain.install - TREECC_PATH = PATH=$(CROSS_PATH) TREECC_ENV = $(CROSS_ENV) -TREECC_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -94,8 +82,6 @@ $(STATEDIR)/treecc.prepare: $(treecc_prepare_deps_default) treecc_compile: $(STATEDIR)/treecc.compile -treecc_compile_deps = $(STATEDIR)/treecc.prepare - $(STATEDIR)/treecc.compile: $(treecc_compile_deps_default) @$(call targetinfo, $@) cd $(TREECC_DIR) && $(TREECC_ENV) $(TREECC_PATH) make @@ -118,8 +104,6 @@ $(STATEDIR)/treecc.install: $(STATEDIR)/treecc.compile treecc_targetinstall: $(STATEDIR)/treecc.targetinstall -treecc_targetinstall_deps = $(STATEDIR)/treecc.compile - $(STATEDIR)/treecc.targetinstall: $(treecc_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/troll-ftpd.make b/rules/troll-ftpd.make index 65623669e..727d3cee4 100644 --- a/rules/troll-ftpd.make +++ b/rules/troll-ftpd.make @@ -32,9 +32,7 @@ TROLL-FTPD_DIR = $(BUILDDIR)/$(TROLL-FTPD) troll-ftpd_get: $(STATEDIR)/troll-ftpd.get -troll-ftpd_get_deps = $(TROLL-FTPD_SOURCE) - -$(STATEDIR)/troll-ftpd.get: $(troll-ftpd_get_deps_default) +$(STATEDIR)/troll-ftpd.get: $(TROLL-FTPD_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(TROLL-FTPD)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(TROLL-FTPD_SOURCE): troll-ftpd_extract: $(STATEDIR)/troll-ftpd.extract -troll-ftpd_extract_deps = $(STATEDIR)/troll-ftpd.get - $(STATEDIR)/troll-ftpd.extract: $(troll-ftpd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(TROLL-FTPD_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/troll-ftpd.extract: $(troll-ftpd_extract_deps) troll-ftpd_prepare: $(STATEDIR)/troll-ftpd.prepare -# -# dependencies -# -troll-ftpd_prepare_deps = \ - $(STATEDIR)/troll-ftpd.extract \ - $(STATEDIR)/virtual-xchain.install - TROLL-FTPD_PATH = PATH=$(CROSS_PATH) TROLL-FTPD_ENV = $(CROSS_ENV) -#TROLL-FTPD_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#TROLL-FTPD_ENV += $(STATEDIR)/troll-ftpd.prepare: $(troll-ftpd_prepare_deps_default) @$(call targetinfo, $@) @@ -89,8 +76,6 @@ $(STATEDIR)/troll-ftpd.prepare: $(troll-ftpd_prepare_deps_default) troll-ftpd_compile: $(STATEDIR)/troll-ftpd.compile -troll-ftpd_compile_deps = $(STATEDIR)/troll-ftpd.prepare - $(STATEDIR)/troll-ftpd.compile: $(troll-ftpd_compile_deps_default) @$(call targetinfo, $@) cd $(TROLL-FTPD_DIR) && $(TROLL-FTPD_ENV) $(TROLL-FTPD_PATH) make @@ -102,7 +87,7 @@ $(STATEDIR)/troll-ftpd.compile: $(troll-ftpd_compile_deps_default) troll-ftpd_install: $(STATEDIR)/troll-ftpd.install -$(STATEDIR)/troll-ftpd.install: $(STATEDIR)/troll-ftpd.compile +$(STATEDIR)/troll-ftpd.install: $(troll-ftpd_compile_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -112,8 +97,6 @@ $(STATEDIR)/troll-ftpd.install: $(STATEDIR)/troll-ftpd.compile troll-ftpd_targetinstall: $(STATEDIR)/troll-ftpd.targetinstall -troll-ftpd_targetinstall_deps = $(STATEDIR)/troll-ftpd.compile - $(STATEDIR)/troll-ftpd.targetinstall: $(troll-ftpd_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/tslib.make b/rules/tslib.make index 5d81ae122..ab48cce52 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -32,9 +32,7 @@ TSLIB_DIR = $(BUILDDIR)/$(TSLIB) tslib_get: $(STATEDIR)/tslib.get -tslib_get_deps = $(TSLIB_SOURCE) - -$(STATEDIR)/tslib.get: $(tslib_get_deps_default) +$(STATEDIR)/tslib.get: $(TSLIB_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(TSLIB)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(TSLIB_SOURCE): tslib_extract: $(STATEDIR)/tslib.extract -tslib_extract_deps = $(STATEDIR)/tslib.get - $(STATEDIR)/tslib.extract: $(tslib_extract_deps) @$(call targetinfo, $@) @$(call clean, $(TSLIB_DIR)) @@ -64,24 +60,13 @@ $(STATEDIR)/tslib.extract: $(tslib_extract_deps) tslib_prepare: $(STATEDIR)/tslib.prepare -# -# dependencies -# -tslib_prepare_deps = \ - $(STATEDIR)/tslib.extract \ - $(STATEDIR)/virtual-xchain.install - TSLIB_PATH = PATH=$(CROSS_PATH) TSLIB_ENV = $(CROSS_ENV) -TSLIB_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -TSLIB_ENV += DESTDIR=$(CROSS_LIB_DIR) # # autoconf # -TSLIB_AUTOCONF = $(CROSS_AUTOCONF_USR) -TSLIB_AUTOCONF += --prefix=/ -TSLIB_AUTOCONF += --sysconfdir=/etc +TSLIB_AUTOCONF = $(CROSS_AUTOCONF_ROOT) $(STATEDIR)/tslib.prepare: $(tslib_prepare_deps_default) @$(call targetinfo, $@) @@ -97,8 +82,6 @@ $(STATEDIR)/tslib.prepare: $(tslib_prepare_deps_default) tslib_compile: $(STATEDIR)/tslib.compile -tslib_compile_deps = $(STATEDIR)/tslib.prepare - $(STATEDIR)/tslib.compile: $(tslib_compile_deps_default) @$(call targetinfo, $@) cd $(TSLIB_DIR) && $(TSLIB_ENV) $(TSLIB_PATH) make @@ -121,8 +104,6 @@ $(STATEDIR)/tslib.install: $(STATEDIR)/tslib.compile tslib_targetinstall: $(STATEDIR)/tslib.targetinstall -tslib_targetinstall_deps = $(STATEDIR)/tslib.compile - $(STATEDIR)/tslib.targetinstall: $(tslib_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/uclibc.make b/rules/uclibc.make index 3ed74492b..77e81ae74 100644 --- a/rules/uclibc.make +++ b/rules/uclibc.make @@ -37,8 +37,6 @@ $(STATEDIR)/uclibc.get: uclibc_extract: $(STATEDIR)/uclibc.extract -uclibc_extract_deps = $(STATEDIR)/uclibc.get - $(STATEDIR)/uclibc.extract: $(uclibc_extract_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -49,8 +47,6 @@ $(STATEDIR)/uclibc.extract: $(uclibc_extract_deps) uclibc_prepare: $(STATEDIR)/uclibc.prepare -uclibc_prepare_deps = $(STATEDIR)/uclibc.extract - $(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -61,8 +57,6 @@ $(STATEDIR)/uclibc.prepare: $(uclibc_prepare_deps_default) uclibc_compile: $(STATEDIR)/uclibc.compile -uclibc_compile_deps = $(STATEDIR)/uclibc.prepare - $(STATEDIR)/uclibc.compile: $(uclibc_compile_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -83,8 +77,6 @@ $(STATEDIR)/uclibc.install: $(STATEDIR)/uclibc.compile uclibc_targetinstall: $(STATEDIR)/uclibc.targetinstall -uclibc_targetinstall_deps = $(STATEDIR)/uclibc.install - $(STATEDIR)/uclibc.targetinstall: $(uclibc_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/udev.make b/rules/udev.make index 18bc3bcd2..42b955fd9 100644 --- a/rules/udev.make +++ b/rules/udev.make @@ -31,11 +31,8 @@ UDEV_DIR = $(BUILDDIR)/$(UDEV) udev_get: $(STATEDIR)/udev.get -udev_get_deps = $(UDEV_SOURCE) - -$(STATEDIR)/udev.get: $(udev_get_deps_default) +$(STATEDIR)/udev.get: $(UDEV_SOURCE) @$(call targetinfo, $@) - @$(call get_patches, $(UDEV)) @$(call touch, $@) $(UDEV_SOURCE): @@ -48,8 +45,6 @@ $(UDEV_SOURCE): udev_extract: $(STATEDIR)/udev.extract -udev_extract_deps = $(STATEDIR)/udev.get - $(STATEDIR)/udev.extract: $(udev_extract_deps) @$(call targetinfo, $@) @$(call clean, $(UDEV_DIR)) @@ -63,13 +58,6 @@ $(STATEDIR)/udev.extract: $(udev_extract_deps) udev_prepare: $(STATEDIR)/udev.prepare -# -# dependencies -# -udev_prepare_deps = \ - $(STATEDIR)/udev.extract \ - $(STATEDIR)/virtual-xchain.install - UDEV_PATH = PATH=$(CROSS_PATH) UDEV_ENV = $(CROSS_ENV) UDEV_MAKEVARS = CROSS=$(COMPILER_PREFIX) @@ -89,8 +77,6 @@ $(STATEDIR)/udev.prepare: $(udev_prepare_deps_default) udev_compile: $(STATEDIR)/udev.compile -udev_compile_deps = $(STATEDIR)/udev.prepare - $(STATEDIR)/udev.compile: $(udev_compile_deps_default) @$(call targetinfo, $@) cd $(UDEV_DIR) && $(UDEV_ENV) $(UDEV_PATH) make $(UDEV_MAKEVARS) @@ -112,8 +98,6 @@ $(STATEDIR)/udev.install: $(STATEDIR)/udev.compile udev_targetinstall: $(STATEDIR)/udev.targetinstall -udev_targetinstall_deps = $(STATEDIR)/udev.compile - $(STATEDIR)/udev.targetinstall: $(udev_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/utelnetd.make b/rules/utelnetd.make index 04b9003c3..60873ff58 100644 --- a/rules/utelnetd.make +++ b/rules/utelnetd.make @@ -44,7 +44,7 @@ $(UTELNETD_SOURCE): utelnetd_extract: $(STATEDIR)/utelnetd.extract -$(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get +$(STATEDIR)/utelnetd.extract: $(utelnetd_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(UTELNETS_DIR)) @$(call extract, $(UTELNETD_SOURCE)) @@ -56,10 +56,6 @@ $(STATEDIR)/utelnetd.extract: $(STATEDIR)/utelnetd.get utelnetd_prepare: $(STATEDIR)/utelnetd.prepare -utelnetd_prepare_deps = \ - $(STATEDIR)/virtual-xchain.install \ - $(STATEDIR)/utelnetd.extract - $(STATEDIR)/utelnetd.prepare: $(utelnetd_prepare_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -73,7 +69,7 @@ utelnetd_compile: $(STATEDIR)/utelnetd.compile UTELNETD_ENVIRONMENT += PATH=$(CROSS_PATH) UTELNETD_MAKEVARS += CROSS=$(COMPILER_PREFIX) -$(STATEDIR)/utelnetd.compile: $(STATEDIR)/utelnetd.prepare +$(STATEDIR)/utelnetd.compile: $(utelnetd_compile_deps_default) @$(call targetinfo, $@) $(UTELNETD_ENVIRONMENT) make -C $(UTELNETD_DIR) $(UTELNETD_MAKEVARS) @$(call touch, $@) @@ -84,7 +80,7 @@ $(STATEDIR)/utelnetd.compile: $(STATEDIR)/utelnetd.prepare utelnetd_install: $(STATEDIR)/utelnetd.install -$(STATEDIR)/utelnetd.install: $(STATEDIR)/utelnetd.compile +$(STATEDIR)/utelnetd.install: $(utelnetd_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -94,7 +90,7 @@ $(STATEDIR)/utelnetd.install: $(STATEDIR)/utelnetd.compile utelnetd_targetinstall: $(STATEDIR)/utelnetd.targetinstall -$(STATEDIR)/utelnetd.targetinstall: $(STATEDIR)/utelnetd.install +$(STATEDIR)/utelnetd.targetinstall: $(utelnetd_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/util-linux.make b/rules/util-linux.make index c9efe42d8..69827a109 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -32,9 +32,7 @@ UTIL-LINUX_DIR = $(BUILDDIR)/$(UTIL-LINUX) util-linux_get: $(STATEDIR)/util-linux.get -util-linux_get_deps = $(UTIL-LINUX_SOURCE) - -$(STATEDIR)/util-linux.get: $(util-linux_get_deps_default) +$(STATEDIR)/util-linux.get: $(UTIL-LINUX_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(UTIL-LINUX)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(UTIL-LINUX_SOURCE): util-linux_extract: $(STATEDIR)/util-linux.extract -util-linux_extract_deps = $(STATEDIR)/util-linux.get - $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps) @$(call targetinfo, $@) @$(call clean, $(UTIL-LINUX_DIR)) @@ -66,13 +62,6 @@ $(STATEDIR)/util-linux.extract: $(util-linux_extract_deps) util-linux_prepare: $(STATEDIR)/util-linux.prepare -# -# dependencies -# -util-linux_prepare_deps = \ - $(STATEDIR)/util-linux.extract \ - $(STATEDIR)/virtual-xchain.install - UTIL-LINUX_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) UTIL-LINUX_ENV = $(CROSS_ENV) @@ -89,8 +78,6 @@ $(STATEDIR)/util-linux.prepare: $(util-linux_prepare_deps_default) util-linux_compile: $(STATEDIR)/util-linux.compile -util-linux_compile_deps = $(STATEDIR)/util-linux.prepare - $(STATEDIR)/util-linux.compile: $(util-linux_compile_deps_default) @$(call targetinfo, $@) @@ -140,8 +127,6 @@ $(STATEDIR)/util-linux.install: $(STATEDIR)/util-linux.compile util-linux_targetinstall: $(STATEDIR)/util-linux.targetinstall -util-linux_targetinstall_deps = $(STATEDIR)/util-linux.compile - $(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/valgrind.make b/rules/valgrind.make index 59015719c..0a0e3aafd 100644 --- a/rules/valgrind.make +++ b/rules/valgrind.make @@ -32,9 +32,7 @@ VALGRIND_DIR = $(BUILDDIR)/$(VALGRIND) valgrind_get: $(STATEDIR)/valgrind.get -valgrind_get_deps = $(VALGRIND_SOURCE) - -$(STATEDIR)/valgrind.get: $(valgrind_get_deps_default) +$(STATEDIR)/valgrind.get: $(VALGRIND_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(VALGRIND)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(VALGRIND_SOURCE): valgrind_extract: $(STATEDIR)/valgrind.extract -valgrind_extract_deps = $(STATEDIR)/valgrind.get - $(STATEDIR)/valgrind.extract: $(valgrind_extract_deps) @$(call targetinfo, $@) @$(call clean, $(VALGRIND_DIR)) @@ -64,12 +60,6 @@ $(STATEDIR)/valgrind.extract: $(valgrind_extract_deps) valgrind_prepare: $(STATEDIR)/valgrind.prepare -# -# dependencies -# -valgrind_prepare_deps = \ - $(STATEDIR)/valgrind.extract - VALGRIND_PATH = PATH=$(CROSS_PATH) VALGRIND_ENV = $(CROSS_ENV) @@ -99,8 +89,6 @@ $(STATEDIR)/valgrind.prepare: $(valgrind_prepare_deps_default) valgrind_compile: $(STATEDIR)/valgrind.compile -valgrind_compile_deps = $(STATEDIR)/valgrind.prepare - $(STATEDIR)/valgrind.compile: $(valgrind_compile_deps_default) @$(call targetinfo, $@) cd $(VALGRIND_DIR) && $(VALGRIND_ENV) $(VALGRIND_PATH) make @@ -112,7 +100,7 @@ $(STATEDIR)/valgrind.compile: $(valgrind_compile_deps_default) valgrind_install: $(STATEDIR)/valgrind.install -$(STATEDIR)/valgrind.install: $(STATEDIR)/valgrind.compile +$(STATEDIR)/valgrind.install: $(valgrind_install_deps_default) @$(call targetinfo, $@) # FIXME: rsc: if --prefix=/, doesn't this install to / on the @@ -127,8 +115,6 @@ $(STATEDIR)/valgrind.install: $(STATEDIR)/valgrind.compile valgrind_targetinstall: $(STATEDIR)/valgrind.targetinstall -valgrind_targetinstall_deps = $(STATEDIR)/valgrind.compile - $(STATEDIR)/valgrind.targetinstall: $(valgrind_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/virtual-libc.make b/rules/virtual-libc.make index f640222ee..01643e5ad 100644 --- a/rules/virtual-libc.make +++ b/rules/virtual-libc.make @@ -27,7 +27,7 @@ ifdef PTXCONF_UCLIBC virtual-libc_install_deps = $(STATEDIR)/uclibc.install endif -$(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps_default) +$(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps) @$(call targetinfo, $@) @$(call touch, $@) @@ -44,6 +44,6 @@ ifdef PTXCONF_UCLIBC virtual-libc_targetinstall_deps = $(STATEDIR)/uclibc.targetinstall endif -$(STATEDIR)/virtual-libc.targetinstall: $(virtual-libc_targetinstall_deps_default) +$(STATEDIR)/virtual-libc.targetinstall: $(virtual-libc_targetinstall_deps) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/virtual-libcxx.make b/rules/virtual-libcxx.make index f6bd3990f..3388be5d8 100644 --- a/rules/virtual-libcxx.make +++ b/rules/virtual-libcxx.make @@ -26,6 +26,6 @@ ifdef PTXCONF_LIBSTDCXX virtual-libcxx_targetinstall_deps = $(STATEDIR)/xchain-gccstage2.targetinstall endif -$(STATEDIR)/virtual-libcxx.targetinstall: $(virtual-libcxx_targetinstall_deps_default) +$(STATEDIR)/virtual-libcxx.targetinstall: $(virtual-libcxx_targetinstall_deps) @$(call targetinfo, $@) - @$(call touch, $@)
\ No newline at end of file + @$(call touch, $@) diff --git a/rules/wget.make b/rules/wget.make index 659f65146..d0d8c18fd 100644 --- a/rules/wget.make +++ b/rules/wget.make @@ -32,9 +32,7 @@ WGET_DIR = $(BUILDDIR)/$(WGET_PACKET) wget_get: $(STATEDIR)/wget.get -wget_get_deps = $(WGET_SOURCE) - -$(STATEDIR)/wget.get: $(wget_get_deps_default) +$(STATEDIR)/wget.get: $(WGET_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(WGET_PACKET)) @$(call touch, $@) @@ -49,8 +47,6 @@ $(WGET_SOURCE): wget_extract: $(STATEDIR)/wget.extract -wget_extract_deps = $(STATEDIR)/wget.get - $(STATEDIR)/wget.extract: $(wget_extract_deps) @$(call targetinfo, $@) @$(call clean, $(WGET_DIR)) @@ -64,17 +60,8 @@ $(STATEDIR)/wget.extract: $(wget_extract_deps) wget_prepare: $(STATEDIR)/wget.prepare -# -# dependencies -# -wget_prepare_deps = \ - $(STATEDIR)/wget.extract \ - $(STATEDIR)/virtual-xchain.install - WGET_PATH = PATH=$(CROSS_PATH) WGET_ENV = $(CROSS_ENV) -#WGET_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig -#WGET_ENV += # # autoconf @@ -97,8 +84,6 @@ $(STATEDIR)/wget.prepare: $(wget_prepare_deps_default) wget_compile: $(STATEDIR)/wget.compile -wget_compile_deps = $(STATEDIR)/wget.prepare - $(STATEDIR)/wget.compile: $(wget_compile_deps_default) @$(call targetinfo, $@) cd $(WGET_DIR) && $(WGET_ENV) $(WGET_PATH) make @@ -121,8 +106,6 @@ $(STATEDIR)/wget.install: $(STATEDIR)/wget.compile wget_targetinstall: $(STATEDIR)/wget.targetinstall -wget_targetinstall_deps = $(STATEDIR)/wget.compile - $(STATEDIR)/wget.targetinstall: $(wget_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/wireless.make b/rules/wireless.make index 6effbbca4..d0f550e78 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -31,8 +31,6 @@ WIRELESS_DIR = $(BUILDDIR)/$(WIRELESS) wireless_get: $(STATEDIR)/wireless.get -wireless_get_deps = $(WIRELESS_SOURCE) - $(STATEDIR)/wireless.get: $(wireless_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -47,8 +45,6 @@ $(WIRELESS_SOURCE): wireless_extract: $(STATEDIR)/wireless.extract -wireless_extract_deps = $(STATEDIR)/wireless.get - $(STATEDIR)/wireless.extract: $(wireless_extract_deps) @$(call targetinfo, $@) @$(call clean, $(WIRELESS_DIR)) @@ -62,8 +58,6 @@ $(STATEDIR)/wireless.extract: $(wireless_extract_deps) wireless_prepare: $(STATEDIR)/wireless.prepare -wireless_prepare_deps = $(STATEDIR)/wireless.extract - $(STATEDIR)/wireless.prepare: $(wireless_prepare_deps_default) @$(call targetinfo, $@) ifdef PTXCONF_WIRELESS_SHARED @@ -81,8 +75,6 @@ WIRELESS_ENV = $(CROSS_ENV) wireless_compile: $(STATEDIR)/wireless.compile -wireless_compile_deps = $(STATEDIR)/wireless.prepare - $(STATEDIR)/wireless.compile: $(wireless_compile_deps_default) @$(call targetinfo, $@) cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) make CC=${CROSS_CC} @@ -94,8 +86,6 @@ $(STATEDIR)/wireless.compile: $(wireless_compile_deps_default) wireless_install: $(STATEDIR)/wireless.install -wireless_compile_deps = $(STATEDIR)/wireless.compile - $(STATEDIR)/wireless.install: $(wireless_compile_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -106,7 +96,7 @@ $(STATEDIR)/wireless.install: $(wireless_compile_deps_default) wireless_targetinstall: $(STATEDIR)/wireless.targetinstall -$(STATEDIR)/wireless.targetinstall: $(STATEDIR)/wireless.install +$(STATEDIR)/wireless.targetinstall: $(wireless_targetinstall_deps_default) @$(call targetinfo, $@) @$(call install_init,default) diff --git a/rules/wxWindows.make b/rules/wxWindows.make index 8aa277854..b1c9de27d 100644 --- a/rules/wxWindows.make +++ b/rules/wxWindows.make @@ -35,8 +35,6 @@ WXWINDOWS_DIR = $(BUILDDIR)/$(WXWINDOWS) wxWindows_get: $(STATEDIR)/wxWindows.get -wxWindows_get_deps = $(WXWINDOWS_SOURCE) - $(STATEDIR)/wxWindows.get: $(wxWindows_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -51,8 +49,6 @@ $(WXWINDOWS_SOURCE): wxWindows_extract: $(STATEDIR)/wxWindows.extract -wxWindows_extract_deps = $(STATEDIR)/wxWindows.get - $(STATEDIR)/wxWindows.extract: $(wxWindows_extract_deps) @$(call targetinfo, $@) @$(call clean, $(WXWINDOWS_DIR)) @@ -66,16 +62,8 @@ $(STATEDIR)/wxWindows.extract: $(wxWindows_extract_deps) wxWindows_prepare: $(STATEDIR)/wxWindows.prepare -# -# dependencies -# -wxWindows_prepare_deps = \ - $(STATEDIR)/wxWindows.extract \ - $(STATEDIR)/virtual-xchain.install - WXWINDOWS_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) WXWINDOWS_ENV = $(CROSS_ENV) -#WXWINDOWS_ENV += # @@ -123,7 +111,7 @@ $(STATEDIR)/wxWindows.compile: $(wxWindows_compile_deps_default) wxWindows_install: $(STATEDIR)/wxWindows.install -$(STATEDIR)/wxWindows.install: $(STATEDIR)/wxWindows.compile +$(STATEDIR)/wxWindows.install: $(wxWindows_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -133,8 +121,6 @@ $(STATEDIR)/wxWindows.install: $(STATEDIR)/wxWindows.compile wxWindows_targetinstall: $(STATEDIR)/wxWindows.targetinstall -wxWindows_targetinstall_deps = $(STATEDIR)/wxWindows.compile - $(STATEDIR)/wxWindows.targetinstall: $(wxWindows_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/xfree430.make b/rules/xfree430.make index 87f9529e7..a2065b8bd 100644 --- a/rules/xfree430.make +++ b/rules/xfree430.make @@ -114,16 +114,6 @@ $(STATEDIR)/xfree430.extract: $(xfree430_extract_deps_default) xfree430_prepare: $(STATEDIR)/xfree430.prepare -# -# dependencies -# -#xfree430_prepare_deps = \ -# $(STATEDIR)/xfree430.extract \ -# $(STATEDIR)/zlib.install \ -# $(STATEDIR)/ncurses.install \ -# $(STATEDIR)/libpng125.install \ -# $(STATEDIR)/virtual-xchain.install - XFREE430_PATH = PATH=$(CROSS_PATH) XFREE430_ENV = XCURSORGEN=xcursorgen diff --git a/rules/xlibs-damageext.make b/rules/xlibs-damageext.make index 5b21eb7a9..40336f0a2 100644 --- a/rules/xlibs-damageext.make +++ b/rules/xlibs-damageext.make @@ -35,9 +35,7 @@ XLIBS-DAMAGEEXT_DIR = $(BUILDDIR)/$(XLIBS-DAMAGEEXT) xlibs-damageext_get: $(STATEDIR)/xlibs-damageext.get -xlibs-damageext_get_deps = $(XLIBS-DAMAGEEXT_SOURCE) - -$(STATEDIR)/xlibs-damageext.get: $(xlibs-damageext_get_deps_default) +$(STATEDIR)/xlibs-damageext.get: $(XLIBS-DAMAGEEXT_SOURCE) @$(call targetinfo, $@) @$(call get_patches, $(XLIBS-DAMAGEEXT)) @$(call touch, $@) @@ -52,8 +50,6 @@ $(XLIBS-DAMAGEEXT_SOURCE): xlibs-damageext_extract: $(STATEDIR)/xlibs-damageext.extract -xlibs-damageext_extract_deps = $(STATEDIR)/xlibs-damageext.get - $(STATEDIR)/xlibs-damageext.extract: $(xlibs-damageext_extract_deps) @$(call targetinfo, $@) @$(call clean, $(XLIBS-DAMAGEEXT_DIR)) @@ -67,15 +63,8 @@ $(STATEDIR)/xlibs-damageext.extract: $(xlibs-damageext_extract_deps) xlibs-damageext_prepare: $(STATEDIR)/xlibs-damageext.prepare -# -# dependencies -# -xlibs-damageext_prepare_deps = $(STATEDIR)/xlibs-damageext.extract -xlibs-damageext_prepare_deps += $(STATEDIR)/virtual-xchain.install - XLIBS-DAMAGEEXT_PATH = PATH=$(CROSS_PATH) XLIBS-DAMAGEEXT_ENV = $(CROSS_ENV) -XLIBS-DAMAGEEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -98,8 +87,6 @@ $(STATEDIR)/xlibs-damageext.prepare: $(xlibs-damageext_prepare_deps_default) xlibs-damageext_compile: $(STATEDIR)/xlibs-damageext.compile -xlibs-damageext_compile_deps = $(STATEDIR)/xlibs-damageext.prepare - $(STATEDIR)/xlibs-damageext.compile: $(xlibs-damageext_compile_deps_default) @$(call targetinfo, $@) cd $(XLIBS-DAMAGEEXT_DIR) && $(XLIBS-DAMAGEEXT_ENV) $(XLIBS-DAMAGEEXT_PATH) make @@ -122,8 +109,6 @@ $(STATEDIR)/xlibs-damageext.install: $(STATEDIR)/xlibs-damageext.compile xlibs-damageext_targetinstall: $(STATEDIR)/xlibs-damageext.targetinstall -xlibs-damageext_targetinstall_deps = $(STATEDIR)/xlibs-damageext.compile - $(STATEDIR)/xlibs-damageext.targetinstall: $(xlibs-damageext_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/xlibs-fixesext.make b/rules/xlibs-fixesext.make index f751551bb..c79a6135f 100644 --- a/rules/xlibs-fixesext.make +++ b/rules/xlibs-fixesext.make @@ -35,8 +35,6 @@ XLIBS-FIXESEXT_DIR = $(BUILDDIR)/$(XLIBS-FIXESEXT) xlibs-fixesext_get: $(STATEDIR)/xlibs-fixesext.get -xlibs-fixesext_get_deps = $(XLIBS-FIXESEXT_SOURCE) - $(STATEDIR)/xlibs-fixesext.get: $(xlibs-fixesext_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(XLIBS-FIXESEXT)) @@ -52,8 +50,6 @@ $(XLIBS-FIXESEXT_SOURCE): xlibs-fixesext_extract: $(STATEDIR)/xlibs-fixesext.extract -xlibs-fixesext_extract_deps = $(STATEDIR)/xlibs-fixesext.get - $(STATEDIR)/xlibs-fixesext.extract: $(xlibs-fixesext_extract_deps) @$(call targetinfo, $@) @$(call clean, $(XLIBS-FIXESEXT_DIR)) @@ -67,15 +63,8 @@ $(STATEDIR)/xlibs-fixesext.extract: $(xlibs-fixesext_extract_deps) xlibs-fixesext_prepare: $(STATEDIR)/xlibs-fixesext.prepare -# -# dependencies -# -xlibs-fixesext_prepare_deps = $(STATEDIR)/xlibs-fixesext.extract -xlibs-fixesext_prepare_deps += $(STATEDIR)/virtual-xchain.install - XLIBS-FIXESEXT_PATH = PATH=$(CROSS_PATH) XLIBS-FIXESEXT_ENV = $(CROSS_ENV) -XLIBS-FIXESEXT_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig # # autoconf @@ -99,8 +88,6 @@ $(STATEDIR)/xlibs-fixesext.prepare: $(xlibs-fixesext_prepare_deps_default) xlibs-fixesext_compile: $(STATEDIR)/xlibs-fixesext.compile -xlibs-fixesext_compile_deps = $(STATEDIR)/xlibs-fixesext.prepare - $(STATEDIR)/xlibs-fixesext.compile: $(xlibs-fixesext_compile_deps_default) @$(call targetinfo, $@) cd $(XLIBS-FIXESEXT_DIR) && $(XLIBS-FIXESEXT_ENV) $(XLIBS-FIXESEXT_PATH) make @@ -123,8 +110,6 @@ $(STATEDIR)/xlibs-fixesext.install: $(STATEDIR)/xlibs-fixesext.compile xlibs-fixesext_targetinstall: $(STATEDIR)/xlibs-fixesext.targetinstall -xlibs-fixesext_targetinstall_deps = $(STATEDIR)/xlibs-fixesext.compile - $(STATEDIR)/xlibs-fixesext.targetinstall: $(xlibs-fixesext_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/xmlstarlet.make b/rules/xmlstarlet.make index fe2c0630b..1435f2e72 100644 --- a/rules/xmlstarlet.make +++ b/rules/xmlstarlet.make @@ -32,12 +32,7 @@ XMLSTARLET_DIR = $(BUILDDIR)/$(XMLSTARLET) xmlstarlet_get: $(STATEDIR)/xmlstarlet.get -xmlstarlet_get_deps = \ - $(XMLSTARLET_SOURCE) \ - $(RULESDIR)/xmlstarlet.make - - -$(STATEDIR)/xmlstarlet.get: $(xmlstarlet_get_deps_default) +$(STATEDIR)/xmlstarlet.get: $(XMLSTARLET_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -51,8 +46,6 @@ $(XMLSTARLET_SOURCE): xmlstarlet_extract: $(STATEDIR)/xmlstarlet.extract -xmlstarlet_extract_deps = $(STATEDIR)/xmlstarlet.get - $(STATEDIR)/xmlstarlet.extract: $(xmlstarlet_extract_deps) @$(call targetinfo, $@) @$(call clean, $(XMLSTARLET_DIR)) @@ -66,14 +59,6 @@ $(STATEDIR)/xmlstarlet.extract: $(xmlstarlet_extract_deps) xmlstarlet_prepare: $(STATEDIR)/xmlstarlet.prepare -# -# dependencies -# -xmlstarlet_prepare_deps = $(STATEDIR)/xmlstarlet.extract -xmlstarlet_prepare_deps += $(STATEDIR)/virtual-xchain.install -xmlstarlet_prepare_deps += $(STATEDIR)/libxml2.install -xmlstarlet_prepare_deps += $(STATEDIR)/libxslt.install - XMLSTARLET_PATH = PATH=$(CROSS_PATH) XMLSTARLET_ENV = $(CROSS_ENV) @@ -100,8 +85,6 @@ $(STATEDIR)/xmlstarlet.prepare: $(xmlstarlet_prepare_deps_default) xmlstarlet_compile: $(STATEDIR)/xmlstarlet.compile -xmlstarlet_compile_deps = $(STATEDIR)/xmlstarlet.prepare - $(STATEDIR)/xmlstarlet.compile: $(xmlstarlet_compile_deps_default) @$(call targetinfo, $@) cd $(XMLSTARLET_DIR) && $(XMLSTARLET_ENV) $(XMLSTARLET_PATH) make @@ -124,10 +107,6 @@ $(STATEDIR)/xmlstarlet.install: $(STATEDIR)/xmlstarlet.compile xmlstarlet_targetinstall: $(STATEDIR)/xmlstarlet.targetinstall -xmlstarlet_targetinstall_deps = $(STATEDIR)/xmlstarlet.compile -xmlstarlet_targetinstall_deps += $(STATEDIR)/libxml2.targetinstall -xmlstarlet_targetinstall_deps += $(STATEDIR)/libxslt.targetinstall - $(STATEDIR)/xmlstarlet.targetinstall: $(xmlstarlet_targetinstall_deps_default) @$(call targetinfo, $@) diff --git a/rules/xserver.make b/rules/xserver.make index eb27dabe4..8262408f8 100644 --- a/rules/xserver.make +++ b/rules/xserver.make @@ -35,8 +35,6 @@ XSERVER_DIR = $(BUILDDIR)/$(XSERVER) xserver_get: $(STATEDIR)/xserver.get -xserver_get_deps = $(XSERVER_SOURCE) - $(STATEDIR)/xserver.get: $(xserver_get_deps_default) @$(call targetinfo, $@) @$(call get_patches, $(XSERVER)) @@ -52,8 +50,6 @@ $(XSERVER_SOURCE): xserver_extract: $(STATEDIR)/xserver.extract -xserver_extract_deps = $(STATEDIR)/xserver.get - $(STATEDIR)/xserver.extract: $(xserver_extract_deps) @$(call targetinfo, $@) @$(call clean, $(XSERVER_DIR)) @@ -67,18 +63,6 @@ $(STATEDIR)/xserver.extract: $(xserver_extract_deps) xserver_prepare: $(STATEDIR)/xserver.prepare -# -# dependencies -# -xserver_prepare_deps = $(STATEDIR)/xserver.extract -xserver_prepare_deps += $(STATEDIR)/virtual-xchain.install -xserver_prepare_deps += $(STATEDIR)/xlibs-xext.install -xserver_prepare_deps += $(STATEDIR)/xlibs-randr.install -xserver_prepare_deps += $(STATEDIR)/xlibs-fixesext.install -xserver_prepare_deps += $(STATEDIR)/xlibs-damageext.install -xserver_prepare_deps += $(STATEDIR)/xlibs-xfont.install -xserver_prepare_deps += $(STATEDIR)/xlibs-render.install - XSERVER_PATH = PATH=$(CROSS_PATH) XSERVER_ENV = $(CROSS_ENV) XSERVER_ENV += PKG_CONFIG_PATH=$(CROSS_LIB_DIR)/lib/pkgconfig @@ -254,8 +238,6 @@ $(STATEDIR)/xserver.prepare: $(xserver_prepare_deps_default) xserver_compile: $(STATEDIR)/xserver.compile -xserver_compile_deps = $(STATEDIR)/xserver.prepare - $(STATEDIR)/xserver.compile: $(xserver_compile_deps_default) @$(call targetinfo, $@) cd $(XSERVER_DIR) && $(XSERVER_ENV) $(XSERVER_PATH) make @@ -278,16 +260,6 @@ $(STATEDIR)/xserver.install: $(STATEDIR)/xserver.compile xserver_targetinstall: $(STATEDIR)/xserver.targetinstall -xserver_targetinstall_deps = $(STATEDIR)/xserver.compile -xserver_targetinstall_deps += $(STATEDIR)/xlibs-xext.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-randr.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-fixesext.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-damageext.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-xfont.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-render.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-x11.targetinstall -xserver_targetinstall_deps += $(STATEDIR)/xlibs-xau.targetinstall - $(STATEDIR)/xserver.targetinstall: $(xserver_targetinstall_deps_default) @$(call targetinfo, $@) @$(call touch, $@) diff --git a/rules/xvkbd.make b/rules/xvkbd.make index bcbd96028..f9d0df2a1 100644 --- a/rules/xvkbd.make +++ b/rules/xvkbd.make @@ -32,9 +32,7 @@ XVKBD_DIR = $(BUILDDIR)/$(XVKBD) xvkbd_get: $(STATEDIR)/xvkbd.get -xvkbd_get_deps = $(XVKBD_SOURCE) - -$(STATEDIR)/xvkbd.get: $(xvkbd_get_deps_default) +$(STATEDIR)/xvkbd.get: $(XVKBD_SOURCE) @$(call targetinfo, $@) @$(call touch, $@) @@ -48,8 +46,6 @@ $(XVKBD_SOURCE): xvkbd_extract: $(STATEDIR)/xvkbd.extract -xvkbd_extract_deps = $(STATEDIR)/xvkbd.get - $(STATEDIR)/xvkbd.extract: $(xvkbd_extract_deps) @$(call targetinfo, $@) @$(call clean, $(XVKBD_DIR)) @@ -62,16 +58,8 @@ $(STATEDIR)/xvkbd.extract: $(xvkbd_extract_deps) xvkbd_prepare: $(STATEDIR)/xvkbd.prepare -# -# dependencies -# -xvkbd_prepare_deps = \ - $(STATEDIR)/xvkbd.extract \ - $(STATEDIR)/virtual-xchain.install - XVKBD_PATH = PATH=$(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin:$(CROSS_PATH) XVKBD_ENV = $(CROSS_ENV) -#XVKBD_ENV += $(STATEDIR)/xvkbd.prepare: $(xvkbd_prepare_deps_default) @$(call targetinfo, $@) @@ -86,8 +74,6 @@ $(STATEDIR)/xvkbd.prepare: $(xvkbd_prepare_deps_default) xvkbd_compile: $(STATEDIR)/xvkbd.compile -xvkbd_compile_deps = $(STATEDIR)/xvkbd.prepare - $(STATEDIR)/xvkbd.compile: $(xvkbd_compile_deps_default) @$(call targetinfo, $@) cd $(XVKBD_DIR) && $(XVKBD_PATH) $(XVKBD_ENV) make @@ -110,8 +96,6 @@ $(STATEDIR)/xvkbd.install: $(STATEDIR)/xvkbd.compile xvkbd_targetinstall: $(STATEDIR)/xvkbd.targetinstall -xvkbd_targetinstall_deps = $(STATEDIR)/xvkbd.compile - $(STATEDIR)/xvkbd.targetinstall: $(xvkbd_targetinstall_deps_default) @$(call targetinfo, $@) |