(REMHDRS): Removed.

Rules dealing with ../lib removed.

1 files changed, 5 insertions, 19 deletions

diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile
index 4ee6d2f4..57c41901 100644
--- a/libdiskfs/Makefile
+++ b/libdiskfs/Makefile
@@ -18,6 +18,7 @@
 dir := libdiskfs
 makemode := library
 
+libname = libdiskfs
 FSSRCS= dir-link.c dir-mkdir.c dir-mkfile.c dir-lookup.c dir-rename.c    \
 	dir-rmdir.c dir-unlink.c file-chauthor.c file-chflags.c file-chown.c \
 	file-get-trans.c file-get-transcntl.c file-getfh.c file-getlinknode.c \
@@ -25,23 +26,17 @@ FSSRCS= dir-link.c dir-mkdir.c dir-mkfile.c dir-lookup.c dir-rename.c    \
 	file-syncfs.c file-truncate.c file-utimes.c file-getcontrol.c       \
 	file-lock.c file-chmod.c dir-readdir.c file-lock-stat.c file-exec.c \
 	dir-chg.c file-chg.c file-access.c file-inv-trans.c
-
 IOSRCS= io-async-icky.c io-async.c io-duplicate.c io-get-conch.c 	    \
 	io-interrupt.c io-map-cntl.c io-map.c io-modes-get.c io-modes-off.c \
 	io-modes-on.c io-modes-set.c io-owner-mod.c io-owner-get.c 	    \
 	io-prenotify.c io-read.c io-readable.c io-reauthenticate.c	    \
 	io-rel-conch.c io-restrict-auth.c io-seek.c io-select.c io-stat.c   \
 	io-stubs.c io-write.c io-version.c io-sigio.c
-
 FSYSSRCS=fsys-getroot.c fsys-goaway.c fsys-startup.c fsys-getfile.c \
 	fsys-options.c fsys-syncfs.c
-
 IFSOCKSRCS=ifsock.c
-
 NOTIFYSRCS=notify-nosenders.c notify-stubs.c
-
 INTSRCS=interrupt.c
-
 OTHERSRCS = conch-fetch.c conch-set.c dir-clear.c dir-init.c dir-renamed.c \
 	node-create.c node-drop.c node-make.c node-rdwr.c node-update.c \
 	peropen-make.c peropen-rele.c protid-make.c protid-rele.c \
@@ -49,27 +44,19 @@ OTHERSRCS = conch-fetch.c conch-set.c dir-clear.c dir-init.c dir-renamed.c \
 	boot-parse.c boot-start.c demuxer.c exc.c node-times.c shutdown.c \
 	sync-interval.c sync-default.c opts-set.c opts-std-startup.c \
 	opts-runtime-def.c trans-callback.c
-
 SRCS = $(NOTIFYSRCS) $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(INTSRCS) \
 	$(IFSOCKSRCS)
+LCLHDRS = diskfs.h priv.h lithp.h fsmutations.h
+installhdrs = diskfs.h
+
 MIGSTUBS = fsServer.o ioServer.o fsysServer.o notifyServer.o execServer.o \
 	interruptServer.o fsys_replyUser.o ourfs_notifyUser.o ifsockServer.o
+OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS))
 
 notify-MIGSFLAGS = -DSEQNOS
 fsys-MIGSFLAGS = -DREPLY_PORTS
-
-OBJS = $(sort $(subst .c,.o,$(SRCS)) $(MIGSTUBS)) argz.o options.o
-
-LCLHDRS = diskfs.h priv.h lithp.h fsmutations.h
-REMHDRS = ../hurd/ports.h ../hurd/pager.h ../hurd/fshelp.h ../hurd/ioserver.h ../lib/argz.h ../lib/options.h
 MIGSFLAGS = -imacros fsmutations.h
 MIGCOMSFLAGS = -prefix diskfs_
-libname = libdiskfs
-installhdrs = diskfs.h
-
-CPPFLAGS += -I../lib
-CPPFLAGS += $(CPPFLAGS-$(notdir $<))
-vpath %.c ../lib
 
 include ../Makeconf
 
@@ -81,4 +68,3 @@ ourfs_notify_U.h ourfs_notifyUser.c: ourfs_notify.defs $(includedir)/hurd/hurd_t
 ourfs_notify.defs: $(includedir)/hurd/fs_notify.defs
 	rm -f $@
 	ln -s $< $@
-