From ecdc8bd6717059d3cce793e829a55ef3e474104b Mon Sep 17 00:00:00 2001 From: nico Date: Thu, 19 May 2005 21:22:09 +0000 Subject: [PATCH] Cosmetic fix git-svn-id: svn://svn.openwrt.org/openwrt/trunk@973 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/dropbear/Makefile | 2 +- openwrt/package/htpdate/Makefile | 4 ++-- openwrt/package/iptables/Makefile | 4 ++-- openwrt/package/kismet/Makefile | 4 ++-- openwrt/package/libpthread/Makefile | 6 +++--- openwrt/package/maradns/Makefile | 4 ++-- openwrt/package/matrixssl/Makefile | 4 ++-- openwrt/package/microperl/Makefile | 4 ++-- openwrt/package/monit/Makefile | 4 ++-- openwrt/package/nfs-server/Makefile | 4 ++-- openwrt/package/nocatsplash/Makefile | 4 ++-- openwrt/package/ntpclient/Makefile | 6 ++++-- openwrt/package/openntpd/Makefile | 4 ++-- openwrt/package/pmacct/Makefile | 4 ++-- openwrt/package/portmap/Makefile | 4 ++-- openwrt/package/ppp/Makefile | 4 ++-- openwrt/package/pptp/Makefile | 4 ++-- openwrt/package/pptpd/Makefile | 4 ++-- openwrt/package/radvd/Makefile | 4 ++-- openwrt/package/robocfg/Makefile | 2 ++ openwrt/package/screen/Makefile | 4 ++-- openwrt/package/setserial/Makefile | 6 ++++-- openwrt/package/shat/Makefile | 4 ++-- openwrt/package/strace/Makefile | 2 +- 24 files changed, 51 insertions(+), 45 deletions(-) diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile index f066089170..6795605c35 100644 --- a/openwrt/package/dropbear/Makefile +++ b/openwrt/package/dropbear/Makefile @@ -58,7 +58,7 @@ $(PKG_BUILD_DIR)/.configured: --disable-pututline \ --disable-pututxline \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ diff --git a/openwrt/package/htpdate/Makefile b/openwrt/package/htpdate/Makefile index 0324eb5702..eb588c5c61 100644 --- a/openwrt/package/htpdate/Makefile +++ b/openwrt/package/htpdate/Makefile @@ -19,13 +19,13 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,HTPDATE,htpdate,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_HTPDATE): install -d -m0755 $(IDIR_HTPDATE)/etc/default/ diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile index c9743fbed2..c81a345ff1 100644 --- a/openwrt/package/iptables/Makefile +++ b/openwrt/package/iptables/Makefile @@ -23,7 +23,7 @@ $(eval $(call PKG_template,IPTABLES_UTILS,iptables-utils,$(PKG_VERSION)-$(PKG_RE $(eval $(call PKG_template,IP6TABLES,ip6tables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: chmod a+x $(PKG_BUILD_DIR)/extensions/.*-test @@ -34,7 +34,7 @@ $(PKG_BUILD_DIR)/.built: KERNEL_DIR=$(LINUX_DIR) PREFIX=/usr \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install install-devel - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_IPTABLES): install -d -m0755 $(IDIR_IPTABLES)/usr/sbin diff --git a/openwrt/package/kismet/Makefile b/openwrt/package/kismet/Makefile index 3f6aa6b4fc..0ae6b5e24e 100644 --- a/openwrt/package/kismet/Makefile +++ b/openwrt/package/kismet/Makefile @@ -50,14 +50,14 @@ $(PKG_BUILD_DIR)/.configured: --enable-syspcap=yes \ --disable-wsp100 \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) \ LIBS="-L$(STAGING_DIR)/lib -fno-builtin -nostdinc++ -nodefaultlibs -luClibc++ -lc -lm" \ CPPFLAGS="-I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(LINUX_DIR)/include" - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_KISMET_CLIENT): install -d -m0755 $(IDIR_KISMET_CLIENT)/etc diff --git a/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile index ae5693d0d1..e74eda78f0 100644 --- a/openwrt/package/libpthread/Makefile +++ b/openwrt/package/libpthread/Makefile @@ -17,13 +17,13 @@ $(eval $(call PKG_template,LIBPTHREAD,libpthread,$(PKG_VERSION)-$(PKG_RELEASE),$ $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.prepared + touch $@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_LIBPTHREAD): mkdir -p $(IDIR_LIBPTHREAD)/lib diff --git a/openwrt/package/maradns/Makefile b/openwrt/package/maradns/Makefile index 8ef1d84cbc..67d6b673a4 100644 --- a/openwrt/package/maradns/Makefile +++ b/openwrt/package/maradns/Makefile @@ -44,7 +44,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --disable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -57,7 +57,7 @@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ PREFIX="$(PKG_INSTALL_DIR)/usr" \ install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_MARADNS): install -d -m0755 $(IDIR_MARADNS)/etc diff --git a/openwrt/package/matrixssl/Makefile b/openwrt/package/matrixssl/Makefile index 356be60fb6..2390513cf2 100644 --- a/openwrt/package/matrixssl/Makefile +++ b/openwrt/package/matrixssl/Makefile @@ -20,13 +20,13 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,LIBMATRIXSSL,libmatrixssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR)/src \ $(TARGET_CONFIGURE_OPTS) \ DFLAGS="$(TARGET_CFLAGS) -Wall" - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_LIBMATRIXSSL): install -d -m0755 $(IDIR_LIBMATRIXSSL)/usr/lib diff --git a/openwrt/package/microperl/Makefile b/openwrt/package/microperl/Makefile index 5a8a8187c7..854d897ed1 100644 --- a/openwrt/package/microperl/Makefile +++ b/openwrt/package/microperl/Makefile @@ -21,12 +21,12 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,MICROPERL,microperl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) -f Makefile.micro \ CC="$(TARGET_CC)" OPTIMIZE="$(TARGET_CFLAGS)" - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_MICROPERL): install -d -m0755 $(IDIR_MICROPERL)/usr/bin diff --git a/openwrt/package/monit/Makefile b/openwrt/package/monit/Makefile index 269c9b8f2d..bbb7c86701 100644 --- a/openwrt/package/monit/Makefile +++ b/openwrt/package/monit/Makefile @@ -43,11 +43,11 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared $(DISABLE_NLS) \ --without-ssl \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_MONIT): install -d -m0755 $(IDIR_MONIT)/etc diff --git a/openwrt/package/nfs-server/Makefile b/openwrt/package/nfs-server/Makefile index 1f72ddfca3..6bc126d3e2 100644 --- a/openwrt/package/nfs-server/Makefile +++ b/openwrt/package/nfs-server/Makefile @@ -43,11 +43,11 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_NFS_SERVER): install -d -m0755 $(IDIR_NFS_SERVER)/etc diff --git a/openwrt/package/nocatsplash/Makefile b/openwrt/package/nocatsplash/Makefile index b869a63f6a..2327debb0f 100644 --- a/openwrt/package/nocatsplash/Makefile +++ b/openwrt/package/nocatsplash/Makefile @@ -46,14 +46,14 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_NLS) \ --with-glib-prefix="$(STAGING_DIR)/usr" \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ all install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_NOCATSPLASH): mkdir -p $(IDIR_NOCATSPLASH) diff --git a/openwrt/package/ntpclient/Makefile b/openwrt/package/ntpclient/Makefile index b83dd93958..a2a3700519 100644 --- a/openwrt/package/ntpclient/Makefile +++ b/openwrt/package/ntpclient/Makefile @@ -1,3 +1,5 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=ntpclient @@ -16,12 +18,12 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,NTPCLIENT,ntpclient,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch @ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" - touch $(PKG_BUILD_DIR)/.built + touch @ $(IPKG_NTPCLIENT): install -d -m0755 $(IDIR_NTPCLIENT)/etc/init.d diff --git a/openwrt/package/openntpd/Makefile b/openwrt/package/openntpd/Makefile index 5902da95bb..8af22b2e37 100644 --- a/openwrt/package/openntpd/Makefile +++ b/openwrt/package/openntpd/Makefile @@ -46,11 +46,11 @@ $(PKG_BUILD_DIR)/.configured: --with-builtin-arc4random \ --with-privsep-user=ntp \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_OPENNTPD): install -d -m0755 $(IDIR_OPENNTPD)/etc diff --git a/openwrt/package/pmacct/Makefile b/openwrt/package/pmacct/Makefile index 0597cd01b8..7807ff74a2 100644 --- a/openwrt/package/pmacct/Makefile +++ b/openwrt/package/pmacct/Makefile @@ -154,10 +154,10 @@ $(eval $(call PKG_package,PMACCTD_PGSQL,pmacctd-pgsql,pmacctd,$(PKG_VERSION)-$(P $(eval $(call PKG_package,PMACCTD_CUSTOM,pmacctd-custom,pmacctd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(BUILD_TARGETS) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PMACCT_CLIENT): install -d -m0755 $(IDIR_PMACCT_CLIENT)/usr/sbin diff --git a/openwrt/package/portmap/Makefile b/openwrt/package/portmap/Makefile index e8476ca3ff..3c8f5d20cd 100644 --- a/openwrt/package/portmap/Makefile +++ b/openwrt/package/portmap/Makefile @@ -20,13 +20,13 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,PORTMAP,portmap,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) -DHOSTS_ACCESS -DFACILITY=LOG_DAEMON -DIGNORE_SIGCHLD" all - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PORTMAP): install -d -m0755 $(IDIR_PORTMAP)/usr/sbin diff --git a/openwrt/package/ppp/Makefile b/openwrt/package/ppp/Makefile index 1da971582d..e1c3907cee 100644 --- a/openwrt/package/ppp/Makefile +++ b/openwrt/package/ppp/Makefile @@ -62,7 +62,7 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: rm -rf $(PKG_INSTALL_DIR) @@ -72,7 +72,7 @@ $(PKG_BUILD_DIR)/.built: COPTS="$(TARGET_CFLAGS)" \ DESTDIR="$(PKG_INSTALL_DIR)/usr" \ all install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PPP): install -d -m0755 $(IDIR_PPP)/etc/ppp diff --git a/openwrt/package/pptp/Makefile b/openwrt/package/pptp/Makefile index b54b9d31d9..6c9f5150d9 100644 --- a/openwrt/package/pptp/Makefile +++ b/openwrt/package/pptp/Makefile @@ -18,14 +18,14 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,PPTP,pptp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ CC=$(TARGET_CC) \ CFLAGS="$(TARGET_CFLAGS)" \ all - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PPTP): install -d -m0755 $(IDIR_PPTP)/etc/init.d diff --git a/openwrt/package/pptpd/Makefile b/openwrt/package/pptpd/Makefile index 5880799fa3..de12556efb 100644 --- a/openwrt/package/pptpd/Makefile +++ b/openwrt/package/pptpd/Makefile @@ -44,7 +44,7 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_NLS) \ --with-pppd-ip-alloc \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -53,7 +53,7 @@ $(PKG_BUILD_DIR)/.built: DESTDIR="$(PKG_INSTALL_DIR)" \ INSTALL="install" \ all install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_PPTPD): install -d -m0755 $(IDIR_PPTPD)/etc diff --git a/openwrt/package/radvd/Makefile b/openwrt/package/radvd/Makefile index a59a1ff6d3..9dea426c4e 100644 --- a/openwrt/package/radvd/Makefile +++ b/openwrt/package/radvd/Makefile @@ -47,7 +47,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --with-logfile=/var/log/radvd.log \ --with-pidfile=/var/run/radvd.pid \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -56,7 +56,7 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) \ DESTDIR="$(PKG_INSTALL_DIR)" \ install - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_RADVD): install -d -m0755 $(IDIR_RADVD)/etc diff --git a/openwrt/package/robocfg/Makefile b/openwrt/package/robocfg/Makefile index 980872f3e7..bc68f89058 100644 --- a/openwrt/package/robocfg/Makefile +++ b/openwrt/package/robocfg/Makefile @@ -1,3 +1,4 @@ +# $Id$ include $(TOPDIR)/rules.mk @@ -13,6 +14,7 @@ $(eval $(call PKG_template,ROBOCFG,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(A $(PKG_BUILD_DIR)/.prepared: mkdir -p $@ + touch $@ $(PKG_BUILD_DIR)/.built: $(TARGET_CC) -o $(PKG_BUILD_DIR)/robocfg robocfg.c diff --git a/openwrt/package/screen/Makefile b/openwrt/package/screen/Makefile index 575c99b783..0e2cffc44c 100644 --- a/openwrt/package/screen/Makefile +++ b/openwrt/package/screen/Makefile @@ -47,11 +47,11 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared --enable-shared \ --disable-static \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured $(MAKE) -C $(PKG_BUILD_DIR) - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_SCREEN): install -d -m0755 $(IDIR_SCREEN)/usr/sbin diff --git a/openwrt/package/setserial/Makefile b/openwrt/package/setserial/Makefile index 204ccc23be..a4f84f9d80 100644 --- a/openwrt/package/setserial/Makefile +++ b/openwrt/package/setserial/Makefile @@ -1,3 +1,5 @@ +# $Id$ + include $(TOPDIR)/rules.mk PKG_NAME:=setserial @@ -40,12 +42,12 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_LARGEFILE) \ $(DISABLE_NLS) \ ) - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ all - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_SETSERIAL): install -d -m0755 $(IDIR_SETSERIAL)/etc/init.d diff --git a/openwrt/package/shat/Makefile b/openwrt/package/shat/Makefile index b945c5042f..bcaabddd19 100644 --- a/openwrt/package/shat/Makefile +++ b/openwrt/package/shat/Makefile @@ -19,13 +19,13 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,SHAT,shat,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) $(PKG_BUILD_DIR)/.configured: - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR)/src \ CC=$(TARGET_CC) LD=$(TARGET_CROSS)ld \ CFLAGS="$(TARGET_CFLAGS) -Wall -I$(PKG_BUILD_DIR)/include/linux/include -I$(PKG_BUILD_DIR)/include -DVERSION=\\\"$(PKG_VERSION)\\\" -DDROP_NETBIOS" - touch $(PKG_BUILD_DIR)/.built + touch $@ $(IPKG_SHAT): install -d -m0755 $(IDIR_SHAT)/usr/sbin diff --git a/openwrt/package/strace/Makefile b/openwrt/package/strace/Makefile index 9a4137aaeb..89c36f78b6 100644 --- a/openwrt/package/strace/Makefile +++ b/openwrt/package/strace/Makefile @@ -44,7 +44,7 @@ $(PKG_BUILD_DIR)/.configured: $(DISABLE_NLS) \ $(DISABLE_LARGEFILE) \ ); - touch $(PKG_BUILD_DIR)/.configured + touch $@ $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ -- 2.11.0