summaryrefslogtreecommitdiff
path: root/trans/Makefile
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1995-08-24 14:43:35 +0000
committerMiles Bader <miles@gnu.org>1995-08-24 14:43:35 +0000
commita30d5a290f2a99cae4e38b4a23ef2ef8e204e956 (patch)
tree5e5f69e13ecc05057a5e4e4c6dadddc48b2ef1fa /trans/Makefile
parentb7f9d4cd4744363c3e0b4138eaf76740f6ca0a27 (diff)
(all): New target.
(symlink, magic, ifsock, fifo, null): Put all dependencies in these targets. (null-HURDLIBS, ifsock-HURDLIBS, fifo-HURDLIBS): Removed. Get rid of rules dealing with error.o
Diffstat (limited to 'trans/Makefile')
-rw-r--r--trans/Makefile33
1 files changed, 9 insertions, 24 deletions
diff --git a/trans/Makefile b/trans/Makefile
index 9b4f4d81..a022fb46 100644
--- a/trans/Makefile
+++ b/trans/Makefile
@@ -18,31 +18,16 @@
dir := trans
makemode := servers
-SRCS = ifsock.c symlink.c magic.c null.c fifo.c
-OBJS = $(subst .c,.o,$(SRCS)) fsysServer.o error.o
targets = symlink ifsock magic null fifo
+SRCS = ifsock.c symlink.c magic.c null.c fifo.c
+OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o
-CPPFLAGS += -I../lib
-CPPFLAGS += $(CPPFLAGS-$(notdir $<))
-vpath %.c ../lib
-null-HURDLIBS=libtrivfs libports libihash
-ifsock-HURDLIBS=libtrivfs libports libihash
-fifo-HURDLIBS=libpipe libtrivfs libports libihash libthreads
-
-include ../Makeconf
-
-symlink: symlink.o fsysServer.o
-
-magic: magic.o fsysServer.o error.o
-
-fifo: fifo.o error.o
-
-# The .a files have to be mentioned explicitly due to a make deficiency,
-# even though they are already specified by null-HURDLIBS above.
-null: null.o error.o ../libtrivfs/libtrivfs.a ../libports/libports.a \
- ../libihash/libihash.a
+all: $(targets)
-ifsock: ifsock.o error.o ../libtrivfs/libtrivfs.a ../libports/libports.a \
- ../libihash/libihash.a ifsockServer.o
+symlink magic: fsysServer.o
+ifsock: ifsockServer.o
+fifo: ../libpipe/libpipe.a ../libthreads/libthreads.a
+null ifsock fifo: ../libtrivfs/libtrivfs.a ../libports/libports.a ../libihash/libihash.a
+$(targets): ../libshouldbeinlibc/libshouldbeinlibc.a
-CPPFLAGS-error.c = -Dprogram_name=program_invocation_name -DHAVE_VPRINTF -DSTDC_HEADERS -DHAVE_STRERROR
+include ../Makeconf