Use exlicit make targets, not directory contents.

21 files changed, 45 insertions, 57 deletions

diff --git a/conf.d.BSD/Makefile b/conf.d.BSD/Makefile
index c48abbf..9bd2b26 100644
--- a/conf.d.BSD/Makefile
+++ b/conf.d.BSD/Makefile
@@ -1,5 +1,5 @@
 DIR=	/etc/conf.d
-CONF=	${CONTENTS} 
+CONF=	localmount moused powerd rarpd
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/conf.d.FreeBSD/Makefile b/conf.d.FreeBSD/Makefile
index c48abbf..46898a1 100644
--- a/conf.d.FreeBSD/Makefile
+++ b/conf.d.FreeBSD/Makefile
@@ -1,5 +1,5 @@
 DIR=	/etc/conf.d
-CONF=	${CONTENTS} 
+CONF=	syscons
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/conf.d/Makefile b/conf.d/Makefile
index c48e551..d1a527b 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,5 +1,5 @@
 DIR=	/etc/conf.d
-CONF=	${CONTENTS}
+CONF=	bootmisc clock fsck hostname local net urandom
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/doc.BSD/Makefile b/doc.BSD/Makefile
index 7b2a15b..87d16f1 100644
--- a/doc.BSD/Makefile
+++ b/doc.BSD/Makefile
@@ -1,5 +1,5 @@
 DIR=	${DOCDIR}/openrc
-INC=	${CONTENTS}
+INC=	net.example
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/doc.Linux/Makefile b/doc.Linux/Makefile
index 7b2a15b..87d16f1 100644
--- a/doc.Linux/Makefile
+++ b/doc.Linux/Makefile
@@ -1,5 +1,5 @@
 DIR=	${DOCDIR}/openrc
-INC=	${CONTENTS}
+INC=	net.example
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/etc.BSD/Makefile b/etc.BSD/Makefile
index ec3153c..d28c6a0 100644
--- a/etc.BSD/Makefile
+++ b/etc.BSD/Makefile
@@ -1,5 +1,5 @@
 DIR=		/etc
-CONF=		${CONTENTS}
+CONF=		rc rc.shutdown
 
 MK=		../mk
 include ${MK}/scripts.mk
diff --git a/init.d.BSD/Makefile b/init.d.BSD/Makefile
index da0be63..6d55581 100644
--- a/init.d.BSD/Makefile
+++ b/init.d.BSD/Makefile
@@ -1,5 +1,7 @@
 DIR=	/etc/init.d
-BIN=	${CONTENTS} 
+SRCS=	hostid.in moused.in newsyslog.in pf.in rarpd.in rc-enabled.in \
+	rpcbind.in savecore.in swap-blk.in sysctl.in syslogd.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/init.d.FreeBSD/Makefile b/init.d.FreeBSD/Makefile
index da0be63..e6cb6ac 100644
--- a/init.d.FreeBSD/Makefile
+++ b/init.d.FreeBSD/Makefile
@@ -1,5 +1,6 @@
 DIR=	/etc/init.d
-BIN=	${CONTENTS} 
+SRCS=	clock.in devd.in dumpon.in ipfw.in mixer.in nscd.in powerd.in syscons.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/init.d.Linux/Makefile b/init.d.Linux/Makefile
index da0be63..b4aaae5 100644
--- a/init.d.Linux/Makefile
+++ b/init.d.Linux/Makefile
@@ -1,5 +1,7 @@
 DIR=	/etc/init.d
-BIN=	${CONTENTS} 
+SRCS=	clock.in consolefont.in keymaps.in modules.in mtab.in numlock.in \
+	procfs.in sysctl.in
+BIN=${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/init.d.NetBSD/Makefile b/init.d.NetBSD/Makefile
index da0be63..4ffdf50 100644
--- a/init.d.NetBSD/Makefile
+++ b/init.d.NetBSD/Makefile
@@ -1,5 +1,6 @@
 DIR=	/etc/init.d
-BIN=	${CONTENTS} 
+SRCS=	ttys.in wscons.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/init.d.misc/Makefile b/init.d.misc/Makefile
index a2be547..100c701 100644
--- a/init.d.misc/Makefile
+++ b/init.d.misc/Makefile
@@ -1,24 +1,6 @@
-DIR=		/etc/init.d
-_SRCS!=		ls *.in
-SRCS?=		${_SRCS}$(shell ls *.in)
-OBJS=		${SRCS:.in=}
+DIR=	/etc/init.d
+SRCS=	avahi-dnsconfd.in avahi.in dbus.in hald.in named.in ntpd.in \
+	openvpn.in polkitd.in sshd.in
 
-MK=		../mk
-include ${MK}/os.mk
+include ${MK}/scripts.mk
 include Makefile.${OS}
-
-VARBASE?=	/var
-
-.SUFFIXES: .in
-
-all: ${OBJS} 
-
-.in:
-	sed -e 's:@PREFIX@:${PREFIX}:' -e 's:@VARBASE@:${VARBASE}:' $< > $@
-
-install: all
-	${INSTALL} -d ${DESTDIR}${DIR} 
-	${INSTALL} ${OBJS} ${DESTDIR}${DIR}
-
-clean:
-	rm -f ${OBJS}
diff --git a/init.d/Makefile b/init.d/Makefile
index 88a2f28..855462c 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -1,5 +1,7 @@
 DIR=	/etc/init.d
-BIN=	${CONTENTS}
+SRCS=	bootmisc.in fsck.in halt.sh.in hostname.in local.in localmount.in \
+	netmount.in root.in swap.in urandom.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/man/Makefile b/man/Makefile
index ee044d3..38a3c74 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -1,9 +1,7 @@
-_MAN3_SH=	ls -1 *.3
-_MAN3!=		${_MAN3_SH}
-MAN3=		${_MAN3}$(shell ${_MAN3_SH})
-_MAN8_SH=	ls -1 *.8
-_MAN8!=		${_MAN8_SH}
-MAN8=		${_MAN8}$(shell ${_MAN8_SH})
+MAN3=		einfo.3 \
+		rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
+		rc_runlevel.3 rc_service.3 rc_strcatpaths.3 rc_strlist.3
+MAN8=		rc-status.8 rc-update.8 rc.8 runscript.8 start-stop-daemon.8
 
 # Handy macro to create symlinks
 # This does rely on correctly formatting our manpages!
diff --git a/mk/scripts.mk b/mk/scripts.mk
index 3ef2eac..34536f8 100644
--- a/mk/scripts.mk
+++ b/mk/scripts.mk
@@ -1,18 +1,11 @@
 # Install rules for our scripts
 # Copyright 2007-2008 Roy Marples <roy@marples.name>
 
-_IN_SH=	ls -1 | sed -n -e 's:\.in$$::p' | xargs; echo
-_IN!=		${_IN_SH}
-OBJS+=		${_IN}$(shell ${_IN_SH})
-
-# We store the contents of the directory for ease of use in Makefiles
-_CONTENTS_SH=	ls -1 | grep -v Makefile | sed -e 's:\.in$$::g' | sort -u | xargs
-_CONTENTS!=	${_CONTENTS_SH}
-CONTENTS=	${_CONTENTS}$(shell ${_CONTENTS_SH})
-
 include ${MK}/sys.mk
 include ${MK}/os.mk
 
+OBJS+=	${SRCS:.in=}
+
 # Tweak our shell scripts
 .SUFFIXES:	.sh.in .in
 .sh.in.sh:
diff --git a/net.BSD/Makefile b/net.BSD/Makefile
index b2becc4..14aba58 100644
--- a/net.BSD/Makefile
+++ b/net.BSD/Makefile
@@ -1,5 +1,5 @@
-DIR = ${RC_LIB}/net
-INC = ${CONTENTS}
+DIR=	${RC_LIB}/net
+INC=	ifconfig.sh
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/net.FreeBSD/Makefile b/net.FreeBSD/Makefile
index b2becc4..513cd77 100644
--- a/net.FreeBSD/Makefile
+++ b/net.FreeBSD/Makefile
@@ -1,5 +1,5 @@
-DIR = ${RC_LIB}/net
-INC = ${CONTENTS}
+DIR=	${RC_LIB}/net
+INC=	iwconfig.sh
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/net.Linux/Makefile b/net.Linux/Makefile
index b2becc4..308685e 100644
--- a/net.Linux/Makefile
+++ b/net.Linux/Makefile
@@ -1,5 +1,7 @@
-DIR = ${RC_LIB}/net
-INC = ${CONTENTS}
+DIR=	${RC_LIB}/net
+INC=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh ccwgroup.sh \
+	clip.sh ifconfig.sh ifplugd.sh ip6to4.sh ipppd.sh iproute2.sh \
+	iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh vlan.sh
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/net/Makefile b/net/Makefile
index 5ea18a1..944c3fc 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,5 +1,6 @@
 DIR=	${RC_LIB}/net
-INC=	${CONTENTS}
+INC=	dhclient.sh dhcpcd.sh macchanger.sh macnet.sh \
+	ssidnet.sh system.sh wpa_supplicant.sh
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/sh.BSD/Makefile b/sh.BSD/Makefile
index 3e5a37c..f454436 100644
--- a/sh.BSD/Makefile
+++ b/sh.BSD/Makefile
@@ -1,5 +1,6 @@
 DIR=	${RC_LIB}/sh
-BIN=	${CONTENTS}
+SRCS=	init.sh.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/sh.Linux/Makefile b/sh.Linux/Makefile
index 3e5a37c..829cb7c 100644
--- a/sh.Linux/Makefile
+++ b/sh.Linux/Makefile
@@ -1,5 +1,6 @@
 DIR=	${RC_LIB}/sh
-BIN=	${CONTENTS}
+SRCS=	init-early.sh.in init.sh.in
+BIN=	${OBJS}
 
 MK=	../mk
 include ${MK}/scripts.mk
diff --git a/sh/Makefile b/sh/Makefile
index ad32802..57a567f 100644
--- a/sh/Makefile
+++ b/sh/Makefile
@@ -1,4 +1,6 @@
 DIR=	${RC_LIB}/sh
+SRCS=	functions.sh.in gendepends.sh.in net.sh.in \
+	rc-functions.sh.in runscript.sh.in
 INC=	init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
 BIN=	gendepends.sh net.sh runscript.sh