From 28cbaf212eb5050da82a638c5a6734df266ed5ad Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Thu, 24 Aug 1995 14:46:32 +0000 Subject: (all): New target. (ps, settrans, showtrans, fsysopts): Put all dependencies in these targets. (settrans-HURDLIBS, showtrans-HURDLIBS, ps-HURDLIBS): Removed. (settrans, showtrans, fsysopts, ps): Get rid of things that are now in libshouldbeinlibc. Get rid of rules dealing with error.o. --- utils/Makefile | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) (limited to 'utils') diff --git a/utils/Makefile b/utils/Makefile index 264de6b2..b2797570 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -18,33 +18,23 @@ dir := utils makemode := utilities -SRCS = shd.c ps.c su.c settrans.c clri.c sync.c reboot.c halt.c showtrans.c mount.sh fsysopts.c -OBJS = $(filter-out mount.sh,$(subst .c,.o,$(SRCS))) argz.o error.o targets = shd ps settrans showtrans clri sync reboot halt su mount fsysopts special-targets = mount +SRCS = shd.c ps.c su.c settrans.c clri.c sync.c reboot.c halt.c showtrans.c mount.sh fsysopts.c DIST_FILES = shd.ChangeLog -ps-HURDLIBS=libps libihash -REMHDRS=../hurd/ps.h ../lib/argz.h ../lib/error.h ../lib/start-trans.h +OBJS = $(filter-out mount.sh,$(SRCS:.c=.o)) + +all: $(targets) + +ps: ../libps/libps.a ../libihash/libihash.a +settrans: start-trans.o +ps settrans showtrans fsysopts: ../libshouldbeinlibc/libshouldbeinlibc.a CPPFLAGS += -I../lib -CPPFLAGS += $(CPPFLAGS-$(notdir $<)) vpath %.c ../lib include ../Makeconf -settrans: settrans.o start-trans.o argz.o error.o -showtrans: showtrans.o argz.o error.o -fsysopts: fsysopts.o argz.o error.o -ps: ps.o error.o ../libps/libps.a ../libihash/libihash.a -shd: shd.o -su: su.o -clri: clri.o -sync: sync.o -reboot: reboot.o -halt: halt.o - mount: mount.sh cp $< $@ - -CPPFLAGS-error.c = -Dprogram_name=program_invocation_name -DHAVE_VPRINTF -DSTDC_HEADERS -DHAVE_STRERROR -- cgit v1.2.3