From 99d3db0311f353fdbfa0eac8c862ba1afd7fab67 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 19 Nov 1999 05:06:38 +0000 Subject: 1999-11-19 Roland McGrath * Makefile (progs, scripts): New variables. (targets, special-targets, SRCS, OBJS): Define in terms of those. (libshouldbeinlibc dep rule): Replaced with static pattern rule with $(progs) as target list, giving %.o dep as well. --- sutils/Makefile | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'sutils/Makefile') diff --git a/sutils/Makefile b/sutils/Makefile index dcb6604b..5b5c2110 100644 --- a/sutils/Makefile +++ b/sutils/Makefile @@ -20,23 +20,22 @@ dir := sutils makemode := utilities -targets = $(special-targets) reboot halt fsck swapon swapoff -special-targets = e2os MAKEDEV losetup +progs = reboot halt fsck swapon swapoff +scripts = e2os MAKEDEV losetup +targets = $(special-targets) $(progs) +special-targets = $(scripts) installationdir = $(sbindir) -SCRIPTS = e2os.sh MAKEDEV.sh losetup.sh -SRCS = reboot.c halt.c fsck.c fstab.c clookup.c swapon.c swapoff.c $(SCRIPTS) +SRCS = $(progs:=.c) $(scripts:=.sh) LCLHDRS = fstab.h -OBJS = $(filter-out $(SCRIPTS),$(SRCS:.c=.o)) +OBJS = $(progs:=.c) HURDLIBS = store shouldbeinlibc include ../Makeconf fsck: fstab.o clookup.o swapon swapoff: ../libstore/libstore.a -reboot halt fsck swapon swapoff: ../libshouldbeinlibc/libshouldbeinlibc.a - -$(filter-out $(special-targets), $(targets)): %: %.o +$(progs): %: %.o ../libshouldbeinlibc/libshouldbeinlibc.a install: $(prefix)/dev $(prefix)/dev/MAKEDEV $(prefix)/dev/MAKEDEV: -- cgit v1.2.3