diff options
| -rw-r--r-- | ufs/Makefile | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ufs/Makefile b/ufs/Makefile index 160e98f4..2676862e 100644 --- a/ufs/Makefile +++ b/ufs/Makefile @@ -26,8 +26,9 @@ DIST_FILES=$(SRCS) ufs.h Makefile fs.h dinode.h dir.h OBJS=$(subst .c,.o,$(SRCS)) exec_server_image.o -LIBS = $(libdiskfs) $(libports) $(libdiskfs) $(libpager) $(libioserver) \ - $(libfshelp) $(libdiskfs) $(libthreads) $(libports) +LIBS = $(hurdinst)/lib/libdiskfscombined.a $(libthreads) + +LIBPARTS = $(libdiskfs) $(libports) $(libpager) $(libioserver) $(libfshelp) all: ufs @@ -54,5 +55,16 @@ sizes.o: fs.h dinode.h subr.o: fs.h tables.o: fs.h +$(hurdinst)/lib/libdiskfscombined.a: $(LIBPARTS) + -mkdir foo + cd foo; $(AR) x $(libdiskfs) + cd foo; $(AR) x $(libports) + cd foo; $(AR) x $(libpager) + cd foo; $(AR) x $(libioserver) + cd foo; $(AR) x $(libfshelp) + cd foo; $(AR) cr $(hurdinst)/lib/libdiskfscombined.a * + rm -rf foo + $(RANLIB) $(hurdinst)/lib/libdiskfscombined.a + $(foreach dir,mkbootfs exec,../$(dir)/%): FORCE $(MAKE) -C $(@D) $(@F) |