Use exlicit make targets, not directory contents.

This commit is contained in:
Roy Marples 2008-03-03 12:34:51 +00:00
parent 0aedc02860
commit 61c476e72d
21 changed files with 45 additions and 57 deletions

View File

@ -1,5 +1,5 @@
DIR= /etc/conf.d DIR= /etc/conf.d
CONF= ${CONTENTS} CONF= localmount moused powerd rarpd
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR= /etc/conf.d DIR= /etc/conf.d
CONF= ${CONTENTS} CONF= syscons
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR= /etc/conf.d DIR= /etc/conf.d
CONF= ${CONTENTS} CONF= bootmisc clock fsck hostname local net urandom
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR= ${DOCDIR}/openrc DIR= ${DOCDIR}/openrc
INC= ${CONTENTS} INC= net.example
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR= ${DOCDIR}/openrc DIR= ${DOCDIR}/openrc
INC= ${CONTENTS} INC= net.example
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR= /etc DIR= /etc
CONF= ${CONTENTS} CONF= rc rc.shutdown
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,7 @@
DIR= /etc/init.d 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 MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,6 @@
DIR= /etc/init.d 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 MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,7 @@
DIR= /etc/init.d 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 MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,6 @@
DIR= /etc/init.d DIR= /etc/init.d
BIN= ${CONTENTS} SRCS= ttys.in wscons.in
BIN= ${OBJS}
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,24 +1,6 @@
DIR= /etc/init.d DIR= /etc/init.d
_SRCS!= ls *.in SRCS= avahi-dnsconfd.in avahi.in dbus.in hald.in named.in ntpd.in \
SRCS?= ${_SRCS}$(shell ls *.in) openvpn.in polkitd.in sshd.in
OBJS= ${SRCS:.in=}
MK= ../mk include ${MK}/scripts.mk
include ${MK}/os.mk
include Makefile.${OS} 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}

View File

@ -1,5 +1,7 @@
DIR= /etc/init.d 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 MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,9 +1,7 @@
_MAN3_SH= ls -1 *.3 MAN3= einfo.3 \
_MAN3!= ${_MAN3_SH} rc_config.3 rc_deptree.3 rc_find_pids.3 rc_plugin_hook.3 \
MAN3= ${_MAN3}$(shell ${_MAN3_SH}) rc_runlevel.3 rc_service.3 rc_strcatpaths.3 rc_strlist.3
_MAN8_SH= ls -1 *.8 MAN8= rc-status.8 rc-update.8 rc.8 runscript.8 start-stop-daemon.8
_MAN8!= ${_MAN8_SH}
MAN8= ${_MAN8}$(shell ${_MAN8_SH})
# Handy macro to create symlinks # Handy macro to create symlinks
# This does rely on correctly formatting our manpages! # This does rely on correctly formatting our manpages!

View File

@ -1,18 +1,11 @@
# Install rules for our scripts # Install rules for our scripts
# Copyright 2007-2008 Roy Marples <roy@marples.name> # 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}/sys.mk
include ${MK}/os.mk include ${MK}/os.mk
OBJS+= ${SRCS:.in=}
# Tweak our shell scripts # Tweak our shell scripts
.SUFFIXES: .sh.in .in .SUFFIXES: .sh.in .in
.sh.in.sh: .sh.in.sh:

View File

@ -1,5 +1,5 @@
DIR = ${RC_LIB}/net DIR= ${RC_LIB}/net
INC = ${CONTENTS} INC= ifconfig.sh
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,5 @@
DIR = ${RC_LIB}/net DIR= ${RC_LIB}/net
INC = ${CONTENTS} INC= iwconfig.sh
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,7 @@
DIR = ${RC_LIB}/net DIR= ${RC_LIB}/net
INC = ${CONTENTS} 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 MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,6 @@
DIR= ${RC_LIB}/net DIR= ${RC_LIB}/net
INC= ${CONTENTS} INC= dhclient.sh dhcpcd.sh macchanger.sh macnet.sh \
ssidnet.sh system.sh wpa_supplicant.sh
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,6 @@
DIR= ${RC_LIB}/sh DIR= ${RC_LIB}/sh
BIN= ${CONTENTS} SRCS= init.sh.in
BIN= ${OBJS}
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,5 +1,6 @@
DIR= ${RC_LIB}/sh DIR= ${RC_LIB}/sh
BIN= ${CONTENTS} SRCS= init-early.sh.in init.sh.in
BIN= ${OBJS}
MK= ../mk MK= ../mk
include ${MK}/scripts.mk include ${MK}/scripts.mk

View File

@ -1,4 +1,6 @@
DIR= ${RC_LIB}/sh 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 INC= init-common-post.sh rc-mount.sh functions.sh rc-functions.sh
BIN= gendepends.sh net.sh runscript.sh BIN= gendepends.sh net.sh runscript.sh