diff options
| author | Thomas Bushnell <thomas@gnu.org> | 1996-09-17 16:43:48 +0000 |
|---|---|---|
| committer | Thomas Bushnell <thomas@gnu.org> | 1996-09-17 16:43:48 +0000 |
| commit | 447352af2fb7582f49e0efaf48d5b2360be8c514 (patch) | |
| tree | be02d46a20b8625aeff05d67650b865967a8cc21 | |
| parent | ad3d97d916a5ced0720f4de084736003bea36407 (diff) | |
*** empty log message ***
| -rw-r--r-- | ufs-fsck/ChangeLog | 8 | ||||
| -rw-r--r-- | ufs-fsck/Makefile | 6 | ||||
| -rw-r--r-- | ufs/ChangeLog | 6 | ||||
| -rw-r--r-- | ufs/Makefile | 3 |
4 files changed, 19 insertions, 4 deletions
diff --git a/ufs-fsck/ChangeLog b/ufs-fsck/ChangeLog index 6c1e84a2..096d8c07 100644 --- a/ufs-fsck/ChangeLog +++ b/ufs-fsck/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 12 16:40:10 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + ($(target)): Delete special depedency. + + * Makefile (vpath tables.c): Put after Makeconf inclusion to catch + setting of $(top_srcdir). + Fri Sep 6 16:44:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * main.c (argp_program_version): Fix typo. diff --git a/ufs-fsck/Makefile b/ufs-fsck/Makefile index 8725de8e..a484428e 100644 --- a/ufs-fsck/Makefile +++ b/ufs-fsck/Makefile @@ -27,9 +27,9 @@ OBJS = $(subst .c,.o,$(SRCS)) tables.o LCLHDRS = fsck.h target = fsck.ufs installationdir = $(sbindir) +HURDLIBS=shouldbeinlibc -vpath tables.c $(top_srcdir)/ufs +include ../Makeconf -$(target): ../libshouldbeinlibc/libshouldbeinlibc.a +vpath tables.c $(top_srcdir)/ufs -include ../Makeconf diff --git a/ufs/ChangeLog b/ufs/ChangeLog index 896297d4..e74328ce 100644 --- a/ufs/ChangeLog +++ b/ufs/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 12 16:36:19 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (ufs.static ufs): Depend on $(library_deps) instead of long list + of libraries. + Fri Sep 6 16:00:42 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * consts.c: Include <version.h>. diff --git a/ufs/Makefile b/ufs/Makefile index d9375989..8d99925b 100644 --- a/ufs/Makefile +++ b/ufs/Makefile @@ -24,10 +24,11 @@ SRCS = alloc.c consts.c dir.c hyper.c inode.c main.c pager.c \ LCLHDRS = ufs.h fs.h dinode.h dir.h OBJS = $(SRCS:.c=.o) +HURDLIBS = diskfs ports pager iohelp fshelp threads ihash shouldbeinlibc ufs.static-LDFLAGS += -static include ../Makeconf -ufs.static ufs: $(OBJS) ../libdiskfs/libdiskfs.a ../libports/libports.a ../libpager/libpager.a ../libiohelp/libiohelp.a ../libfshelp/libfshelp.a ../libthreads/libthreads.a ../libihash/libihash.a ../libshouldbeinlibc/libshouldbeinlibc.a +ufs.static ufs: $(OBJS) $(library_deps) |