From: Michael Tremer Date: Thu, 30 Apr 2009 07:17:11 +0000 (+0200) Subject: Added new targets to some files that are in old format, yet. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbb99f932d26c4cac35186bd7ba075b81ccdf96a;p=ipfire-3.x.git Added new targets to some files that are in old format, yet. --- diff --git a/lfs/groff b/lfs/groff index 93e9be528..68de0564d 100644 --- a/lfs/groff +++ b/lfs/groff @@ -60,20 +60,26 @@ endef objects = $(DL_FILE) \ $(THISAPP)-debian_fixes-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### # Installation Details ############################################################################### -$(OBJECT) : +$(OBJECT): $(objects) @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-debian_fixes-1.patch cd $(DIR_APP) && sed -i -e 's/2010/002D/' -e 's/2212/002D/' \ -e 's/2018/0060/' -e 's/2019/0027/' font/devutf8/R.proto diff --git a/lfs/images b/lfs/images index 3fdd1cd36..b7e61e3a5 100644 --- a/lfs/images +++ b/lfs/images @@ -24,9 +24,22 @@ include Config -VER = ipfire +PKG_NAME = images +PKG_VER = +PKG_REL = -1 -THISAPP = images +THISAPP = $(PKG_NAME) + +OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) + +MAINTAINER = +GROUP = +EXTRA = no +DEBUG = no +DEPS = + +URL = +LICENSE = PASS = $(firstword $(MAKEFILE_LIST)) @@ -36,8 +49,6 @@ else PREFIX = isolinux endif -OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) - ROOTFILES = $(DIR_SOURCE)/rootfiles/core ifeq "$(BUILD_DEBUG)" "1" ROOTFILES += $(DIR_SOURCE)/rootfiles/debug @@ -47,9 +58,20 @@ endif # Top-level Rules ############################################################################### -install : $(OBJECT) +objects = + +download: $(objects) + +info: + $(DO_PKG_INFO) + +install: $(OBJECT) + +package: + @$(DO_PACKAGE) -download : +$(objects): + @$(LOAD) ############################################################################### # Installation Details diff --git a/lfs/initramfs b/lfs/initramfs index 96c300215..d32c3021c 100644 --- a/lfs/initramfs +++ b/lfs/initramfs @@ -35,9 +35,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -install : $(OBJECT) +objects = -download : +download: $(objects) + +info: + $(DO_PKG_INFO) + +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): + @$(LOAD) ############################################################################### # Installation Details diff --git a/lfs/libjpeg b/lfs/libjpeg index 12616d7ad..c7120b5b9 100644 --- a/lfs/libjpeg +++ b/lfs/libjpeg @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libnetfilter_conntrack b/lfs/libnetfilter_conntrack index df1a1ea7f..a739954be 100644 --- a/lfs/libnetfilter_conntrack +++ b/lfs/libnetfilter_conntrack @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libnetfilter_log b/lfs/libnetfilter_log index d9fce868c..398996ba7 100644 --- a/lfs/libnetfilter_log +++ b/lfs/libnetfilter_log @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue index 1cb63f1d9..c57cab0b0 100644 --- a/lfs/libnetfilter_queue +++ b/lfs/libnetfilter_queue @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libnfnetlink b/lfs/libnfnetlink index 7004069e0..9c2966931 100644 --- a/lfs/libnfnetlink +++ b/lfs/libnfnetlink @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libpcap b/lfs/libpcap index 29305dc10..eee6fd7ab 100644 --- a/lfs/libpcap +++ b/lfs/libpcap @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libpng b/lfs/libpng index 0900d9db7..4b30e821c 100644 --- a/lfs/libpng +++ b/lfs/libpng @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libtiff b/lfs/libtiff index ae534940e..0f88a0055 100644 --- a/lfs/libtiff +++ b/lfs/libtiff @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libusb b/lfs/libusb index 8d2497eee..1a8570b34 100644 --- a/lfs/libusb +++ b/lfs/libusb @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libusb-compat b/lfs/libusb-compat index 134691d58..d98f499b0 100644 --- a/lfs/libusb-compat +++ b/lfs/libusb-compat @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libuser b/lfs/libuser index 3e6fcc045..c85d2a145 100644 --- a/lfs/libuser +++ b/lfs/libuser @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libxml2 b/lfs/libxml2 index f423c7591..0ece0f983 100644 --- a/lfs/libxml2 +++ b/lfs/libxml2 @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/libxslt b/lfs/libxslt index 2b4ceae34..7f916f3d5 100644 --- a/lfs/libxslt +++ b/lfs/libxslt @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/lighttpd b/lfs/lighttpd index bf1cf5cf1..8916a61c4 100644 --- a/lfs/lighttpd +++ b/lfs/lighttpd @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/linux-atm b/lfs/linux-atm index f50be10f9..a4c49ba06 100644 --- a/lfs/linux-atm +++ b/lfs/linux-atm @@ -37,16 +37,21 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-gcc-4.patch $(THISAPP)-nmu.diff +objects = $(DL_FILE) \ + $(THISAPP)-gcc-4.patch \ + $(THISAPP)-nmu.diff + +download: $(objects) info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/lm-sensors b/lfs/lm-sensors index 00b7fe9b4..0c1ccf4e8 100644 --- a/lfs/lm-sensors +++ b/lfs/lm-sensors @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/logrotate b/lfs/logrotate index 6c24e9b9b..b3dc0ef26 100644 --- a/lfs/logrotate +++ b/lfs/logrotate @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/lsof b/lfs/lsof index 832c8d51c..eb4eb1f6d 100644 --- a/lfs/lsof +++ b/lfs/lsof @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/lzo b/lfs/lzo index 81cc64935..928a0e346 100644 --- a/lfs/lzo +++ b/lfs/lzo @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/m4 b/lfs/m4 index 2e1abc2c7..02c45c32a 100644 --- a/lfs/m4 +++ b/lfs/m4 @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/make b/lfs/make index 05676e3b3..a3f1b51aa 100644 --- a/lfs/make +++ b/lfs/make @@ -37,13 +37,19 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects =$(DL_FILE) +objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/man-db b/lfs/man-db index 7e4d0c832..ae6231502 100644 --- a/lfs/man-db +++ b/lfs/man-db @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/man-pages b/lfs/man-pages index 5ea5cdb1d..84019410d 100644 --- a/lfs/man-pages +++ b/lfs/man-pages @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/mc b/lfs/mc index bdec5282c..5e2526571 100644 --- a/lfs/mc +++ b/lfs/mc @@ -44,14 +44,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-utf8.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/memtest86+ b/lfs/memtest86+ index e745cd163..2e58eca12 100644 --- a/lfs/memtest86+ +++ b/lfs/memtest86+ @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/mingetty b/lfs/mingetty index 2c630e73a..c80f66799 100644 --- a/lfs/mingetty +++ b/lfs/mingetty @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/mkinitramfs b/lfs/mkinitramfs index a94fad5d9..6e55cc4bb 100644 --- a/lfs/mkinitramfs +++ b/lfs/mkinitramfs @@ -37,9 +37,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -install : $(OBJECT) +objects = -download : +download: $(objects) + +info: + $(DO_PKG_INFO) + +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): + @$(LOAD) ############################################################################### # Installation Details diff --git a/lfs/mpfr b/lfs/mpfr index 12d7bde44..e7b11193c 100644 --- a/lfs/mpfr +++ b/lfs/mpfr @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/nano b/lfs/nano index ee9632673..f20f2fc44 100644 --- a/lfs/nano +++ b/lfs/nano @@ -44,14 +44,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-open-macro.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/nasm b/lfs/nasm index b0748f129..bc7d0177d 100644 --- a/lfs/nasm +++ b/lfs/nasm @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/ncurses b/lfs/ncurses index 6536ae50d..cb4aa154a 100644 --- a/lfs/ncurses +++ b/lfs/ncurses @@ -37,13 +37,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-coverity_fixes-1.patch +objects = $(DL_FILE) \ + $(THISAPP)-coverity_fixes-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/newt b/lfs/newt index 3f33d566d..b096dd841 100644 --- a/lfs/newt +++ b/lfs/newt @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/noip b/lfs/noip index b4bd2bd14..6e4ebe4f7 100644 --- a/lfs/noip +++ b/lfs/noip @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/nss_ldap b/lfs/nss_ldap index 6f18278ea..3d81b505a 100644 --- a/lfs/nss_ldap +++ b/lfs/nss_ldap @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/ntp b/lfs/ntp index 3c1de5cd9..ec1bcc5ff 100644 --- a/lfs/ntp +++ b/lfs/ntp @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/openldap b/lfs/openldap index abe0eb5cd..a0fd8edf4 100644 --- a/lfs/openldap +++ b/lfs/openldap @@ -44,14 +44,17 @@ CFLAGS += -D_GNU_SOURCE objects = $(DL_FILE) \ $(THISAPP)-disable_sys_err.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/openssh b/lfs/openssh index 092fa60e3..2818cd873 100644 --- a/lfs/openssh +++ b/lfs/openssh @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/openssl b/lfs/openssl index ae2bde606..090d3393c 100644 --- a/lfs/openssl +++ b/lfs/openssl @@ -55,14 +55,17 @@ objects = $(DL_FILE) \ $(THISAPP)-enginesdir.patch \ $(THISAPP)-no-rpath.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pam b/lfs/pam index 7cfe71848..af98e38b5 100644 --- a/lfs/pam +++ b/lfs/pam @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)-pass$(PASS) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pam_ldap b/lfs/pam_ldap index e0d33cbbf..d6ad01197 100644 --- a/lfs/pam_ldap +++ b/lfs/pam_ldap @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pango b/lfs/pango index b14c49235..adffa8320 100644 --- a/lfs/pango +++ b/lfs/pango @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/parted b/lfs/parted index b9aa5408a..5d40ba09e 100644 --- a/lfs/parted +++ b/lfs/parted @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/patch b/lfs/patch index 8bfdbc7dc..43c81440a 100644 --- a/lfs/patch +++ b/lfs/patch @@ -37,13 +37,21 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-mkstemp-1.patch $(THISAPP)-fixes-1.patch +objects = $(DL_FILE) \ + $(THISAPP)-mkstemp-1.patch \ + $(THISAPP)-fixes-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/paxctl b/lfs/paxctl index a195364ee..252417280 100644 --- a/lfs/paxctl +++ b/lfs/paxctl @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pcre b/lfs/pcre index 8a6e5b905..4d36b2159 100644 --- a/lfs/pcre +++ b/lfs/pcre @@ -41,14 +41,17 @@ DEPS = bzip2 zlib objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/perl b/lfs/perl index 9394c2cc8..0444cf8ca 100644 --- a/lfs/perl +++ b/lfs/perl @@ -41,11 +41,17 @@ objects = $(DL_FILE) \ $(THISAPP)-page-1.patch \ $(THISAPP)-security_fix-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/perl-xml-parser b/lfs/perl-xml-parser index 36ce31c21..e8e709b43 100644 --- a/lfs/perl-xml-parser +++ b/lfs/perl-xml-parser @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pixman b/lfs/pixman index c37ce7f61..86b39e220 100644 --- a/lfs/pixman +++ b/lfs/pixman @@ -48,14 +48,17 @@ endif objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pkg-config b/lfs/pkg-config index 948c710dc..e064daa04 100644 --- a/lfs/pkg-config +++ b/lfs/pkg-config @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pomona b/lfs/pomona index 1535547be..400a9af02 100644 --- a/lfs/pomona +++ b/lfs/pomona @@ -36,9 +36,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -install : $(OBJECT) +objects = -download : +download: $(objects) + +info: + $(DO_PKG_INFO) + +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): + @$(LOAD) ############################################################################### # Installation Details diff --git a/lfs/popt b/lfs/popt index 281e80b4a..4dfff1123 100644 --- a/lfs/popt +++ b/lfs/popt @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/ppp b/lfs/ppp index 3c834dfbf..0eca43309 100644 --- a/lfs/ppp +++ b/lfs/ppp @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/procps b/lfs/procps index 4e58b5b69..9443d772c 100644 --- a/lfs/procps +++ b/lfs/procps @@ -40,11 +40,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-watch_unicode-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/psmisc b/lfs/psmisc index b384fa34c..8a1fcdba2 100644 --- a/lfs/psmisc +++ b/lfs/psmisc @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/pyfire b/lfs/pyfire index dfa87ff42..22370cd9a 100644 --- a/lfs/pyfire +++ b/lfs/pyfire @@ -38,14 +38,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python b/lfs/python index 3ad52783b..dc02e98f4 100644 --- a/lfs/python +++ b/lfs/python @@ -37,16 +37,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-gdbm-1.patch +objects = $(DL_FILE) \ + $(THISAPP)-gdbm-1.patch + +download: $(objects) info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python-IPy b/lfs/python-IPy index b6ae8cbdb..06061c091 100644 --- a/lfs/python-IPy +++ b/lfs/python-IPy @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python-dbus b/lfs/python-dbus index 38bc79583..e752b18bc 100644 --- a/lfs/python-dbus +++ b/lfs/python-dbus @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python-netfilter_conntrack b/lfs/python-netfilter_conntrack index 3b6c07eb1..54e9b7d58 100644 --- a/lfs/python-netfilter_conntrack +++ b/lfs/python-netfilter_conntrack @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python-parted b/lfs/python-parted index 214cd8cfa..0dd9781ea 100644 --- a/lfs/python-parted +++ b/lfs/python-parted @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/python-urlgrabber b/lfs/python-urlgrabber index 3d8727d4d..f387fcdfb 100644 --- a/lfs/python-urlgrabber +++ b/lfs/python-urlgrabber @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/quality-agent b/lfs/quality-agent index 8179e4d40..7ab8734b1 100644 --- a/lfs/quality-agent +++ b/lfs/quality-agent @@ -51,7 +51,7 @@ endef # Top-level Rules ############################################################################### -objects = +objects = download: $(objects) diff --git a/lfs/readline b/lfs/readline index 4f5d51062..b11fecccb 100644 --- a/lfs/readline +++ b/lfs/readline @@ -40,11 +40,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-shlib-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/reiser4progs b/lfs/reiser4progs index 3f389e80c..02fed1556 100644 --- a/lfs/reiser4progs +++ b/lfs/reiser4progs @@ -40,14 +40,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-bad_elif.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs index 6af1d08ad..7f23db9ad 100644 --- a/lfs/reiserfsprogs +++ b/lfs/reiserfsprogs @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/rp-pppoe b/lfs/rp-pppoe index 510bf1239..9294b9900 100644 --- a/lfs/rp-pppoe +++ b/lfs/rp-pppoe @@ -37,16 +37,20 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-iproute2-1.patch +objects = $(DL_FILE) \ + $(THISAPP)-iproute2-1.patch + +download: $(objects) info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/rrdtool b/lfs/rrdtool index 1a8959770..14b36c114 100644 --- a/lfs/rrdtool +++ b/lfs/rrdtool @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/screen b/lfs/screen index 06beaccfe..816263342 100644 --- a/lfs/screen +++ b/lfs/screen @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/slang b/lfs/slang index 37c51bdf6..87c7377a7 100644 --- a/lfs/slang +++ b/lfs/slang @@ -42,14 +42,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) \ $(THISAPP)-makefile.patch +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/smartmontools b/lfs/smartmontools index 1a30a37a4..1a85ab6b2 100644 --- a/lfs/smartmontools +++ b/lfs/smartmontools @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/splashy b/lfs/splashy index 8748c4366..616bc5b32 100644 --- a/lfs/splashy +++ b/lfs/splashy @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/sqlite b/lfs/sqlite index 17ce8de23..625ac55f7 100644 --- a/lfs/sqlite +++ b/lfs/sqlite @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/squashfs-tools b/lfs/squashfs-tools index 71a368887..dea98488d 100644 --- a/lfs/squashfs-tools +++ b/lfs/squashfs-tools @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/squid b/lfs/squid index 84a0b3b04..bf7b6d2ab 100644 --- a/lfs/squid +++ b/lfs/squid @@ -42,14 +42,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/strace b/lfs/strace index 581a60003..d12bf8d75 100644 --- a/lfs/strace +++ b/lfs/strace @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/strip b/lfs/strip index 26e9697c4..6f288fc00 100644 --- a/lfs/strip +++ b/lfs/strip @@ -43,9 +43,20 @@ WHAT = -mount -type f -not -path '.$(TOOLS_DIR)*' \ # Top-level Rules ############################################################################### -install : $(OBJECT) +objects = $(DL_FILE) -download : +download: $(objects) + +info: + $(DO_PKG_INFO) + +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): + @$(LOAD) ############################################################################### # Installation Details diff --git a/lfs/sudo b/lfs/sudo index 5e0d95844..0c6e39e22 100644 --- a/lfs/sudo +++ b/lfs/sudo @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/sysfsutils b/lfs/sysfsutils index 77a4bafc9..d07512352 100644 --- a/lfs/sysfsutils +++ b/lfs/sysfsutils @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/syslinux b/lfs/syslinux index 0f81b7327..85ae03033 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -39,16 +39,21 @@ CFLAGS = -Werror -Wno-unused -finline-limit=2000 # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(THISAPP)-nopie.patch $(THISAPP)-nostrip.patch +objects = $(DL_FILE) \ + $(THISAPP)-nopie.patch \ + $(THISAPP)-nostrip.patch + +download: $(objects) info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/sysvinit b/lfs/sysvinit index d2ff8b335..caf23203a 100644 --- a/lfs/sysvinit +++ b/lfs/sysvinit @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/texinfo b/lfs/texinfo index eb871c83b..45c0faf91 100644 --- a/lfs/texinfo +++ b/lfs/texinfo @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### @@ -66,6 +72,7 @@ endif ifeq "$(STAGE)" "base" cd $(DIR_APP) && \ + LDFLAGS="-lncursesw" \ ./configure \ $(CONFIGURE_ARCH) \ --prefix=/usr diff --git a/lfs/ulogd2 b/lfs/ulogd2 index 8a5412775..f48d3cec2 100644 --- a/lfs/ulogd2 +++ b/lfs/ulogd2 @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/usbutils b/lfs/usbutils index a467ee480..fa29e987d 100644 --- a/lfs/usbutils +++ b/lfs/usbutils @@ -41,14 +41,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/util-linux-ng b/lfs/util-linux-ng index de87a9b6a..5efc751a6 100644 --- a/lfs/util-linux-ng +++ b/lfs/util-linux-ng @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/vim b/lfs/vim index 58df0376a..7ba3a1546 100644 --- a/lfs/vim +++ b/lfs/vim @@ -41,11 +41,17 @@ objects = $(DL_FILE) \ $(THISAPP)-fixes-4.patch \ $(THISAPP)-mandir-1.patch -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/vlan b/lfs/vlan index 28beca9b0..127ca5926 100644 --- a/lfs/vlan +++ b/lfs/vlan @@ -39,11 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) -install : $(OBJECT) +download: $(objects) -download : $(objects) +info: + $(DO_PKG_INFO) -$(objects) : +install: $(OBJECT) + +package: + @$(DO_PACKAGE) + +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/webinterface b/lfs/webinterface index ee81dc70c..61186706f 100644 --- a/lfs/webinterface +++ b/lfs/webinterface @@ -53,7 +53,9 @@ endef # Top-level Rules ############################################################################### -download: +objects = $(DL_FILE) + +download: $(objects) info: $(DO_PKG_INFO) @@ -63,6 +65,9 @@ install: $(OBJECT) package: @$(DO_PACKAGE) +$(objects): + @$(LOAD) + ############################################################################### # Installation Details ############################################################################### diff --git a/lfs/which b/lfs/which index 6e959fe83..9156f4a17 100644 --- a/lfs/which +++ b/lfs/which @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ############################################################################### diff --git a/lfs/whois b/lfs/whois index 9cc6ac9d1..aa5b96efb 100644 --- a/lfs/whois +++ b/lfs/whois @@ -39,14 +39,17 @@ OBJECT = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP) objects = $(DL_FILE) +download: $(objects) + info: $(DO_PKG_INFO) install: $(OBJECT) -download : $(objects) +package: + @$(DO_PACKAGE) -$(objects) : +$(objects): @$(LOAD) ###############################################################################