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 | dcf8f5b059e9ae3f767dc4069859dceba756328a (patch) | |
| tree | 0079e8ac765fb551a9778ede1643145a954992a4 | |
| parent | 88f8b13a55f5dac05830f486d0403b11b107c975 (diff) | |
*** empty log message ***
59 files changed, 295 insertions, 80 deletions
@@ -1,3 +1,18 @@ +Thu Sep 12 15:45:34 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (include $(addsuffix .d,$(subdirs))): New directive to + get dependencies for directories included. + ($(addsuffix .d,$(subdirs))) New target. + * Makeconf (library_deps): New variable. + (directory-depend): New target. + ($(..)/$(dir).d): New target. + ($(target)) [doinst == one]: Depend on libraries from library_deps. + ($(libname).so) [makemode == library]: Likewise. + + * Makefile ($(prog-subdirs) $(lib-subdirs)): New rule. + (%-all): Delete rule. + (all): Depend on directory names without appended -all. + Sun Sep 8 14:21:57 1996 Miles Bader <miles@gnu.ai.mit.edu> * Makefile (prog-subdirs): Add storeio. @@ -12,10 +12,14 @@ # SRCS (all actual source code) # LCLHDRS (all source headers in this directory [NOT MiG created]) # OBJS (all .o files used to produce some target). +# HURDLIBS (all Hurd libraries used; with no directory name or `lib' attached) +# For types `server' and `utility' an automatic dependency will be +# written for these, and type `library' will include a .so dependency. +# Types `servers' and `utilities'; you have to do it yourself. # Types `server' and `utility' should define -# OTHERLIBS (all other libraries used) # target (the name of the program built) +# OTHERLIBS (all libraries used) # Types `servers' and `utilities' should define # targets (the names of all the programs built) @@ -67,6 +71,9 @@ top_srcdirinc=-I$(top_srcdir) endif CPPFLAGS += -I. $(srcdirinc) -I.. $(top_srcdirinc) -I$(top_srcdir)/include -D_GNU_SOURCE CFLAGS += -Wall -g -O3 + +# More useful version of HURDLIBS +library_deps=$(foreach lib,$(HURDLIBS),$(..)lib$(lib)/lib$(lib).so) # Local programs: MKINSTALLDIRS = $(top_srcdir)/mkinstalldirs @@ -200,7 +207,7 @@ ifeq ($(doinst),many) endif ifeq ($(doinst),one) -$(target): $(OBJS) $(OTHERLIBS) +$(target): $(OBJS) $(OTHERLIBS) $(library_deps) endif # Determine which sort of library we should link against from whether -static @@ -230,11 +237,17 @@ $(libname).a: $(OBJS) $(AR) r $@ $^ $(RANLIB) $@ -$(libname).so: $(patsubst %.o,%_pic.o,$(OBJS)) +$(libname).so: $(patsubst %.o,%_pic.o,$(OBJS)) $(library_deps) $(CC) -shared -Wl,-soname=$(libname).so -o $(libname).so \ $(rpath) $(CFLAGS) $(LDFLAGS) $($@-LDFLAGS) $^ endif +# Providing directory dependencies +directory-depend: $(..)$(dir).d +$(..)$(dir).d: Makefile + rm -f $@ + echo $(dir): $(addprefix lib,$(HURDLIBS)) > $@ + # Making a snapshot distfiles = Makefile ChangeLog $(SRCS) $(LCLHDRS) $(DIST_FILES) lndist: $(distfiles) $(top_srcdir)/hurd-snap/$(dir) FORCE @@ -24,57 +24,55 @@ endif include $(srcdir)/Makeconf +DIST_FILES = COPYING Makeconf config.make.in configure.in configure \ + hurd.boot build.mk.in build.mkcf.in SETUP \ + README NEWS tasks INSTALL INSTALL-cross version.h sh-version.sed + + +## Subdirectories of this directory should all be mentioned here + +# Hurd libraries lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \ libpager libfshelp libdiskfs libtrivfs libps \ libnetfs libpipe libstore libmom libhurdbugaddr + +# Hurd programs prog-subdirs = auth boot exec fstests init \ proc term ufs utils sutils trans ufs-fsck \ devio storeio ufs-utils ext2fs benchmarks pflocal defpager \ login nfs pfinet daemons nfsd + +# Other directories other-subdirs = hurd doc config release include + +# All the subdirectories together subdirs = $(lib-subdirs) $(prog-subdirs) $(other-subdirs) + +# Any subdirectories here that we don't want to distribute to the world subdirs-nodist = + +# This allows the creation of a file BROKEN in any of the prog-subdirs; +# that will prevent this top level Makefile from attempting to make it. working-prog-subdirs := $(filter-out \ $(patsubst %/,%,\ $(dir $(wildcard $(prog-subdirs:=/BROKEN)))),\ $(prog-subdirs)) -DIST_FILES = COPYING Makeconf config.make.in configure.in configure \ - hurd.boot build.mk.in build.mkcf.in SETUP \ - README NEWS tasks INSTALL INSTALL-cross version.h sh-version.sed - -all: $(addsuffix -all,$(lib-subdirs) $(working-prog-subdirs)) - -%-all: - $(MAKE) -C $* all - -%-lndist: $(top_srcdir)/hurd-snap - $(MAKE) -C $* lndist no_deps=t - -%-clean: - $(MAKE) -C $* clean no_deps=t - -%-relink: - $(MAKE) -C $* relink -%-install: - $(MAKE) -C $* install - -%-install-headers: - $(MAKE) -C $* install-headers -%-TAGS: - $(MAKE) -C $* TAGS no_deps=t + +## GNU Coding Standards targets (not all are here yet), and some other +## similar sorts of things -$(srcdir)/hurd-snap: - mkdir $(srcdir)/hurd-snap +all: $(lib-subdirs) $(working-prog-subdirs) +# Create a distribution tar file. Set make variable `version' on the +# command line; otherwise the tar file will be a dated snapshot. ifeq ($(version),) version:=$(shell date +%y%m%d) dirname:=hurd-snap else dirname:=hurd endif - dist: $(srcdir)/hurd-snap $(addsuffix -lndist,$(filter-out $(subdirs-nodist), $(subdirs))) lndist mv $(srcdir)/hurd-snap $(srcdir)/$(dirname)-$(version) cd $(srcdir); tar cfz $(dirname)-$(version).tar.gz $(dirname)-$(version) @@ -91,6 +89,35 @@ install-headers: $(addsuffix -install-headers,$(lib-subdirs) \ $(working-prog-subdirs)\ $(other-subdirs)) +TAGS: $(addsuffix -TAGS,$(prog-subdirs) $(lib-subdirs)) + + +## Targets used by the main targets above. +$(prog-subdirs) $(lib-subdirs): FORCE + $(MAKE) -C $@ all +FORCE: + +%-lndist: $(top_srcdir)/hurd-snap + $(MAKE) -C $* lndist no_deps=t + +%-clean: + $(MAKE) -C $* clean no_deps=t + +%-relink: + $(MAKE) -C $* relink + +%-install: + $(MAKE) -C $* install + +%-install-headers: + $(MAKE) -C $* install-headers + +%-TAGS: + $(MAKE) -C $* TAGS no_deps=t + +$(srcdir)/hurd-snap: + mkdir $(srcdir)/hurd-snap + lndist: cp-linked-files linked-files = install-sh config.guess config.sub mkinstalldirs @@ -99,8 +126,6 @@ cp-linked-files: $(lf-inst) $(lf-inst): $(srcdir)/hurd-snap/%: $(srcdir)/% cp $< $@ -TAGS: $(addsuffix -TAGS,$(prog-subdirs) $(lib-subdirs)) - .PHONY: clean-misc distclean clean-misc: @@ -109,3 +134,15 @@ distclean: clean ifneq (.,${srcdir}) rm -f Makefile endif + + +## Directory dependencies +# +# Some directories depend on others, so we need to find out exactly +# what they are. This does that for us. + +-include $(addsuffix .d,$(subdirs)) + +# How to build them +$(addsuffix .d,$(subdirs)): %.d: %/Makefile + $(MAKE) -C $* directory-depend no_deps=t @@ -19,6 +19,7 @@ See `tasks', the exported task list. * Write coding standards suggestions for Hurd * Implement file_fetch_dir * --help strings need to mention bug reporting address +* Conform to coding standards (esp. CFLAGS setting) * Fix emacs/src/unexelf.c to deal with occasional lack of mmap @@ -203,14 +204,17 @@ See `tasks', the exported task list. script by other than root (it doesn't now if the script specifies --retry="$0" because the exec server will use /dev/fd/N for name, and child_lookup() doesn't supply more than fds 0-2). -** fsck should use (not-yet-added) fsys_get_options returned device instead - of /etc/fstab. ** Write/port the various helpful mach info programs in UX (vminfo, etc). ** Serverboot doesn't deal with symlinks properly. ** Grub doesn't deal with symlinks properly. ** `sush --help' gets a bus error. ** `uptime --help' and `uptime --version' fail. +** fsck: +*** fsck should use (not-yet-added) fsys_get_options returned device instead + of /etc/fstab. +*** If fstab mentions a bad type, fsck gets as assert failure. + ** settrans: *** needs an option to make the active go away without using goaway. *** -P should print the pid of the translator before pausing diff --git a/auth/ChangeLog b/auth/ChangeLog index 55c978a7..36128936 100644 --- a/auth/ChangeLog +++ b/auth/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:27:31 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (auth): Delete special depedencies. + Thu Sep 5 11:05:37 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * auth.c (AUTH_VERSION): Delete macro. diff --git a/auth/Makefile b/auth/Makefile index 74eb135d..da41cdd0 100644 --- a/auth/Makefile +++ b/auth/Makefile @@ -22,10 +22,9 @@ SRCS = auth.c OBJS = auth.o authServer.o auth_replyUser.o LCLHDRS = authmutations.h auth_mig.h target = auth +HURDLIBS=ports threads ihash shouldbeinlibc MIGSFLAGS = -imacros $(srcdir)/authmutations.h include ../Makeconf -auth: ../libports/libports.so ../libthreads/libthreads.so \ - ../libihash/libihash.so ../libshouldbeinlibc/libshouldbeinlibc.so diff --git a/boot/ChangeLog b/boot/ChangeLog index 324c4a2b..20c42894 100644 --- a/boot/ChangeLog +++ b/boot/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:28:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (boot): Delete special depedencies. + Tue Aug 13 16:57:22 1996 Miles Bader <miles@gnu.ai.mit.edu> * Makefile (device.defs): Rule removed. diff --git a/boot/Makefile b/boot/Makefile index f8a8be5e..363df260 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -28,6 +28,7 @@ LCLHDRS = boot_script.h ux.h target = boot io-MIGSFLAGS=-DREPLY_PORTS DIST_FILES=frank1.ld frankemul.ld +HURDLIBS=threads include ../Makeconf @@ -41,7 +42,6 @@ all: boot # uxboot ourdevice.defs: device.defs $(CPP) $(CPPFLAGS) -x c $< | sed -e '/out device : device_t/s/device_t/mach_port_send_t/' > $@ -boot: ../libthreads/libthreads.so uxboot.o: boot.c $(COMPILE.c) -DUX $< -o $@ diff --git a/config/ChangeLog b/config/ChangeLog index 1214cc91..ce3ab90a 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 10 13:53:31 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile ($(installed_conf)): Depend on $(sysconfdir). + ($(installed_links)): Likewise. + Mon Aug 5 13:43:28 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile (SYSCONFFILES): Add `resolv.conf'. diff --git a/config/Makefile b/config/Makefile index adad800f..536521db 100644 --- a/config/Makefile +++ b/config/Makefile @@ -59,6 +59,7 @@ install: $(installed_conf) $(installed_links) $(installed_logins) \ $(installed_rootdots): $(prefix)/root $(installed_logins): $(sysconfdir)/login +$(installed_links) $(installed_conf): $(sysconfdir) $(prefix)/root $(sysconfdir)/login: %: mkdir -p $@ diff --git a/daemons/ChangeLog b/daemons/ChangeLog index 32fe0651..4db5bd8e 100644 --- a/daemons/ChangeLog +++ b/daemons/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 12 16:50:12 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + Wed Aug 14 10:22:39 1996 Miles Bader <miles@gnu.ai.mit.edu> * Makefile (getty-LDLIBS): New variable. diff --git a/daemons/Makefile b/daemons/Makefile index 00beb292..4665f3c1 100644 --- a/daemons/Makefile +++ b/daemons/Makefile @@ -25,6 +25,7 @@ special-targets = rc SRCS = rc.sh getty.c installationdir = $(libexecdir) +HURDLIBS=shouldbeinlibc OBJS = $(SRCS:.c=.o) getty-LDLIBS = -lutil diff --git a/exec/ChangeLog b/exec/ChangeLog index 2b6eb242..715b2677 100644 --- a/exec/ChangeLog +++ b/exec/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:30:12 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (exec): Delete special dependencies. + Thu Sep 5 11:11:19 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * main.c: Include <version.h>. diff --git a/exec/Makefile b/exec/Makefile index 6a5d9525..c88720b6 100644 --- a/exec/Makefile +++ b/exec/Makefile @@ -27,6 +27,7 @@ LCLHDRS = gzip.h crypt.h tailor.h priv.h execmutations.h target = exec DIST_FILES = core.c gcore.c elfcore.c exectrans.c #OTHERLIBS = -lbfd -liberty +HURDLIBS=trivfs threads shouldbeinlibc fshelp exec-MIGSFLAGS = -imacros $(srcdir)/execmutations.h @@ -34,5 +35,3 @@ include ../Makeconf CPPFLAGS += -DGZIP # -DBFD -exec: ../libtrivfs/libtrivfs.so ../libthreads/libthreads.so \ - ../libshouldbeinlibc/libshouldbeinlibc.so ../libfshelp/libfshelp.so diff --git a/ext2fs/ChangeLog b/ext2fs/ChangeLog index 60f5157f..016e7af4 100644 --- a/ext2fs/ChangeLog +++ b/ext2fs/ChangeLog @@ -1,3 +1,9 @@ +Thu Sep 12 16:41:20 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (ext2fs ext2fs.static): Depend on $(library_deps) instead of + explicit list. + Fri Sep 6 16:03:11 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * ext2fs.c: Include <version.h>. diff --git a/ext2fs/Makefile b/ext2fs/Makefile index 0c4d3467..3d28d91b 100644 --- a/ext2fs/Makefile +++ b/ext2fs/Makefile @@ -24,10 +24,12 @@ SRCS = balloc.c bitmap.c dir.c ext2fs.c getblk.c hyper.c ialloc.c \ inode.c pager.c pokel.c truncate.c storeinfo.c msg.c OBJS = $(SRCS:.c=.o) LCLHDRS = ext2fs.h ext2_fs.h ext2_fs_i.h +HURDLIBS=diskfs pager iohelp fshelp ports threads ihash shouldbeinlibc ext2fs.static-LDFLAGS += -static include ../Makeconf -ext2fs ext2fs.static: $(OBJS) ../libdiskfs/libdiskfs.a ../libpager/libpager.a ../libiohelp/libiohelp.a ../libfshelp/libfshelp.a ../libports/libports.a ../libthreads/libthreads.a ../libihash/libihash.a ../libshouldbeinlibc/libshouldbeinlibc.a +ext2fs ext2fs.static: $(OBJS) $(library_deps) + diff --git a/hurd/ChangeLog b/hurd/ChangeLog index 562729b5..a16e5dce 100644 --- a/hurd/ChangeLog +++ b/hurd/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 10 11:11:20 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (INSTHDRS): Omit `version.h'. + Thu Sep 5 10:39:40 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * version.h: File removed. diff --git a/hurd/Makefile b/hurd/Makefile index 37ccddb4..53436d87 100644 --- a/hurd/Makefile +++ b/hurd/Makefile @@ -21,7 +21,7 @@ makemode := misc hdrs = $(wildcard $(srcdir)/*.defs $(srcdir)/*.h) DIST_FILES = subsystems $(notdir $(hdrs)) -INSTHDRS = hurd_types.h ioctl_types.h paths.h shared.h version.h \ +INSTHDRS = hurd_types.h ioctl_types.h paths.h shared.h \ $(notdir $(wildcard $(srcdir)/*.defs)) include ../Makeconf diff --git a/init/ChangeLog b/init/ChangeLog index 7e3b7617..0751c9e9 100644 --- a/init/ChangeLog +++ b/init/ChangeLog @@ -1,3 +1,10 @@ +Thu Sep 12 16:32:31 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (init): Delete special target. + + * Makefile (mung_msg_S.h): Put rule *after* inclusion of Makeconf. + Thu Sep 5 11:12:32 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * init.c: Include <version.h>. diff --git a/init/Makefile b/init/Makefile index 0724c408..da1ee177 100644 --- a/init/Makefile +++ b/init/Makefile @@ -22,13 +22,12 @@ SRCS = init.c OBJS = init.o startupServer.o notifyServer.o startup_replyUser.o msgServer.o \ startup_notifyUser.o target = init +HURDLIBS=ports fshelp shouldbeinlibc LDLIBS=-lutil -init: $(OBJS) ../libports/libports.a ../libfshelp/libfshelp.a ../libshouldbeinlibc/libshouldbeinlibc.a +include ../Makeconf mung_msg_S.h: msg_S.h sed 's/msg_server/mung_msg_server/' < $< > $@ -include ../Makeconf - diff --git a/libdiskfs/ChangeLog b/libdiskfs/ChangeLog index 986d18dc..6e52e54c 100644 --- a/libdiskfs/ChangeLog +++ b/libdiskfs/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:22:27 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile: New variable. + (libdiskfs.so): Delete special depedency. + Thu Sep 5 11:13:54 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * io-version.c (diskfs_S_io_server_version): Only fill in diff --git a/libdiskfs/Makefile b/libdiskfs/Makefile index e2304863..215928f9 100644 --- a/libdiskfs/Makefile +++ b/libdiskfs/Makefile @@ -59,6 +59,8 @@ MIGSTUBS = fsServer.o ioServer.o fsysServer.o exec_startupServer.o \ startup_notifyServer.o OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS)) +HURDLIBS= threads ports fshelp shouldbeinlibc iohelp + fsys-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h -DREPLY_PORTS fs-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h io-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h @@ -66,6 +68,3 @@ ifsock-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h MIGCOMSFLAGS = -prefix diskfs_ include ../Makeconf - -libdiskfs.so: $(foreach lib,threads ports fshelp shouldbeinlibc iohelp,\ - ../lib$(lib)/lib$(lib).so) diff --git a/libfshelp/ChangeLog b/libfshelp/ChangeLog index fb6241bb..a7cd8b0e 100644 --- a/libfshelp/ChangeLog +++ b/libfshelp/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:21:51 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libfshelp.so): Delete special dependency. + Tue Jul 16 11:30:42 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> * lock-acquire.c (EWOULDBLOCK): Define, to work around new libc diff --git a/libfshelp/Makefile b/libfshelp/Makefile index ac2d0c9a..8015e1a8 100644 --- a/libfshelp/Makefile +++ b/libfshelp/Makefile @@ -30,9 +30,8 @@ SRCS = lock-acquire.c lock-init.c \ LCLHDRS = fshelp.h locks.h trans.h installhdrs = fshelp.h +HURDLIBS=shouldbeinlibc threads OBJS = $(subst .c,.o,$(SRCS)) include ../Makeconf -libfshelp.so: $(foreach lib,shouldbeinlibc threads,\ - ../lib$(lib)/lib$(lib).so) diff --git a/libiohelp/ChangeLog b/libiohelp/ChangeLog index b890e9a8..e70d5d14 100644 --- a/libiohelp/ChangeLog +++ b/libiohelp/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:18:46 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libfshelp.so): Delete special dependency. + Thu May 9 12:42:51 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> * Makefile: All occurrences of `ioserver' replaced with `iohelp'. diff --git a/libiohelp/Makefile b/libiohelp/Makefile index 9dfc8ca4..9202f9e8 100644 --- a/libiohelp/Makefile +++ b/libiohelp/Makefile @@ -23,9 +23,8 @@ SRCS = get_conch.c handle_io_get_conch.c handle_io_release_conch.c \ OBJS = get_conch.o handle_io_get_conch.o handle_io_release_conch.o \ initialize_conch.o verify_user_conch.o LCLHDRS = iohelp.h +HURDLIBS = threads libname = libiohelp installhdrs = iohelp.h include ../Makeconf - -libfshelp.so: ../libthreads/libthreads.so diff --git a/libpager/ChangeLog b/libpager/ChangeLog index e8f5d305..c9fa537e 100644 --- a/libpager/ChangeLog +++ b/libpager/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:21:14 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libpager.so): Delete special depedency. + Tue Aug 13 10:47:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * object-terminate.c (_pager_free_structure): Don't bother calling diff --git a/libpager/Makefile b/libpager/Makefile index f8c0999a..fc23364a 100644 --- a/libpager/Makefile +++ b/libpager/Makefile @@ -29,6 +29,7 @@ SRCS = data-request.c data-return.c data-unlock.c pager-port.c \ LCLHDRS = pager.h priv.h installhdrs = pager.h +HURDLIBS= threads ports OBJS = $(SRCS:.c=.o) memory_objectServer.o notifyServer.o MIGSFLAGS = -DSEQNOS @@ -36,5 +37,3 @@ MIGCOMSFLAGS = -prefix _pager_ include ../Makeconf -libpager.so: $(foreach lib,threads ports,\ - ../lib$(lib)/lib$(lib).so) diff --git a/libpipe/ChangeLog b/libpipe/ChangeLog index cbc850c4..a87e0bd0 100644 --- a/libpipe/ChangeLog +++ b/libpipe/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:24:41 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libpipe.so): Delete special dependency. + Tue Jul 16 11:33:34 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> * pipe.h (EWOULDBLOCK): Define to work around new libc bug. diff --git a/libpipe/Makefile b/libpipe/Makefile index 8fed5382..bb864dd4 100644 --- a/libpipe/Makefile +++ b/libpipe/Makefile @@ -1,6 +1,6 @@ # Makefile for libpipe # -# Copyright (C) 1995 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -26,8 +26,7 @@ SRCS = pq.c dgram.c pipe.c stream.c seqpack.c addr.c LCLHDRS = pipe.h pq.h OBJS = $(SRCS:.c=.o) +HURDLIBS=threads ports include ../Makeconf -libpipe.so: $(foreach lib,threads ports,\ - ../lib$(lib)/lib$(lib).so) diff --git a/libports/ChangeLog b/libports/ChangeLog index a81fdd34..25e2e73d 100644 --- a/libports/ChangeLog +++ b/libports/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:19:35 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libports.so): Delete special depedency. + Wed Aug 7 15:28:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * ports.h (_ports_create_port_internal, diff --git a/libports/Makefile b/libports/Makefile index 50ccd0c9..d3db7d30 100644 --- a/libports/Makefile +++ b/libports/Makefile @@ -40,11 +40,10 @@ SRCS = create-bucket.c create-class.c \ LCLHDRS = ports.h installhdrs = ports.h +HURDLIBS= ihash OBJS = $(SRCS:.c=.o) notifyServer.o interruptServer.o MIGCOMSFLAGS = -prefix ports_ include ../Makeconf -libports.so: $(foreach lib,ihash,\ - ../lib$(lib)/lib$(lib).so) diff --git a/libps/ChangeLog b/libps/ChangeLog index ff633deb..38dd6662 100644 --- a/libps/ChangeLog +++ b/libps/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:23:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libps.so): Delete special depedency. + Fri Aug 2 15:12:19 1996 Miles Bader <miles@gnu.ai.mit.edu> * procstat.c (set_procinfo_flags): Pass HAVE to count_threads. diff --git a/libps/Makefile b/libps/Makefile index 8c8a22fc..d7c6e472 100644 --- a/libps/Makefile +++ b/libps/Makefile @@ -29,6 +29,7 @@ LCLHDRS=ps.h common.h installhdrs=$(LCLHDRS) installhdrsubdir = . +HURDLIBS=ihash OBJS = $(SRCS:.c=.o) msgUser.o termUser.o msg-MIGUFLAGS = -D'MSG_IMPORTS=waittime 1000;' -DUSERPREFIX=ps_ @@ -39,4 +40,4 @@ ps_%.h: %_U.h include ../Makeconf -libps.so: ../libihash/libihash.so + diff --git a/libtrivfs/ChangeLog b/libtrivfs/ChangeLog index c561d330..83b1f653 100644 --- a/libtrivfs/ChangeLog +++ b/libtrivfs/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:23:15 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (libtrivfs.so): Delete special depedency. + Fri Aug 16 19:24:45 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * migsupport.c (trivfs_end_using_protid): Only call diff --git a/libtrivfs/Makefile b/libtrivfs/Makefile index 66333f32..ac18858c 100644 --- a/libtrivfs/Makefile +++ b/libtrivfs/Makefile @@ -44,6 +44,7 @@ SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(OTHERSRCS) MIGSTUBS=fsServer.o ioServer.o fsysServer.o fsys_replyUser.o +HURDLIBS=ports OBJS= $(sort $(subst .c,.o,$(SRCS)) $(MIGSTUBS)) LCLHDRS = trivfs.h fsmutations.h priv.h MIGSFLAGS=-imacros $(srcdir)/fsmutations.h @@ -53,4 +54,3 @@ installhdrs = trivfs.h include ../Makeconf -libtrivfs.so: ../libports/libports.so diff --git a/nfs/ChangeLog b/nfs/ChangeLog index e3c5c4a9..8ab915b0 100644 --- a/nfs/ChangeLog +++ b/nfs/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:46:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (nfs): Omit special dependency. + Tue Sep 3 14:00:25 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * nfs-spec.h: Renamed from rpcsvc/nfs_prot.h. diff --git a/nfs/Makefile b/nfs/Makefile index da35cc03..8c5baebd 100644 --- a/nfs/Makefile +++ b/nfs/Makefile @@ -25,8 +25,8 @@ target = nfs LCLHDRS = nfs.h mount.h nfs-spec.h SRCS = ops.c rpc.c mount.c cred.c nfs.c cache.c consts.c main.c OBJS = $(subst .c,.o,$(SRCS)) +HURDLIBS=ports netfs fshelp threads -nfs: $(OBJS) ../libports/libports.a ../libnetfs/libnetfs.a ../libfshelp/libfshelp.a ../libthreads/libthreads.a include ../Makeconf diff --git a/nfsd/ChangeLog b/nfsd/ChangeLog index aee85ea1..a19323e9 100644 --- a/nfsd/ChangeLog +++ b/nfsd/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:52:13 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (nfsd): Delete special depedency. + Tue Sep 3 14:15:50 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * loop.c: Include "../nfs/mount.h" instead of diff --git a/nfsd/Makefile b/nfsd/Makefile index 265301f3..2c05b7ed 100644 --- a/nfsd/Makefile +++ b/nfsd/Makefile @@ -26,9 +26,9 @@ OBJS = $(subst .c,.o,$(SRCS)) LCLHDRS = nfsd.h target = nfsd installationdir = $(sbindir) +HURDLIBS=threads shouldbeinlibc include ../Makeconf CPPFLAGS += -DLOCALSTATEDIR=\"$(localstatedir)\" -nfsd: ../libthreads/libthreads.a ../libshouldbeinlibc/libshouldbeinlibc.a
\ No newline at end of file diff --git a/pfinet/ChangeLog b/pfinet/ChangeLog index 1eee7896..ae4d44fd 100644 --- a/pfinet/ChangeLog +++ b/pfinet/ChangeLog @@ -1,3 +1,11 @@ +Thu Sep 12 16:47:24 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (pfinet): Omit special dependency. + + * Makefile (vpath %.c): Put this after Makeconf inclusion so it + catches setting of $(srcdir) there. + Fri Sep 6 16:46:43 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * socket-ops.c (S_socket_recv): Bother to pass diff --git a/pfinet/Makefile b/pfinet/Makefile index f36e8693..b4023be9 100644 --- a/pfinet/Makefile +++ b/pfinet/Makefile @@ -40,16 +40,14 @@ FROBBEDLINUXHEADERS = autoconf.h config.h errno.h etherdevice.h fcntl.h \ string.h tcp.h termios.h time.h timer.h types.h udp.h un.h wait.h ASMHEADERS=bitops.h segment.h system.h -pfinet: $(OBJS) ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a \ - ../libthreads/libthreads.a ../libports/libports.a \ - ../libihash/libihash.a ../libshouldbeinlibc/libshouldbeinlibc.a - -vpath %.c $(srcdir)/linux-inet +HURDLIBS=trivfs fshelp threads ports ihash shouldbeinlibc target = pfinet include ../Makeconf +vpath %.c $(srcdir)/linux-inet + CPPFLAGS += -imacros $(srcdir)/config.h io-MIGSFLAGS = -imacros $(srcdir)/mutations.h diff --git a/pflocal/ChangeLog b/pflocal/ChangeLog index 5b2d5b36..386d6694 100644 --- a/pflocal/ChangeLog +++ b/pflocal/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:43:09 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (pflocal): Omit special dependency. + Tue Jul 23 19:44:29 1996 Miles Bader <miles@gnu.ai.mit.edu> * sock.c (sock_create): Remove NEXT_SOCK_ID. diff --git a/pflocal/Makefile b/pflocal/Makefile index 5ab1a86e..d5768b32 100644 --- a/pflocal/Makefile +++ b/pflocal/Makefile @@ -26,9 +26,8 @@ LCLHDRS = connq.h sock.h mig-decls.h mig-mutate.h sserver.h MIGSTUBS = ioServer.o socketServer.o OBJS = $(SRCS:.c=.o) $(MIGSTUBS) +HURDLIBS = pipe trivfs fshelp ports threads ihash shouldbeinlibc MIGSFLAGS = -imacros $(srcdir)/mig-mutate.h -pflocal: $(OBJS) ../libpipe/libpipe.a ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libthreads/libthreads.a ../libihash/libihash.a ../libshouldbeinlibc/libshouldbeinlibc.a - include ../Makeconf diff --git a/proc/ChangeLog b/proc/ChangeLog index 24b13925..9745ce63 100644 --- a/proc/ChangeLog +++ b/proc/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:33:49 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (proc): Delete special dependency. + Thu Sep 5 10:43:39 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * host.c (struct server_version): Delete member `release'. diff --git a/proc/Makefile b/proc/Makefile index b666c4f7..a1159700 100644 --- a/proc/Makefile +++ b/proc/Makefile @@ -31,9 +31,7 @@ MIGSFLAGS="-DPROCESS_INTRAN=pstruct_t reqport_find (process_t)" \ MIGSTUBS = processServer.o notifyServer.o \ ourmsgUser.o proc_excUser.o proc_excServer.o OBJS = $(SRCS:.c=.o) $(MIGSTUBS) - -proc: $(OBJS) ../libthreads/libthreads.a ../libihash/libihash.a \ - ../libports/libports.a ../libshouldbeinlibc/libshouldbeinlibc.a +HURDLIBS=threads ihash ports shouldbeinlibc include ../Makeconf diff --git a/release/=announce-0.1 b/release/=announce-0.1 index 2549b52a..b33af968 100644 --- a/release/=announce-0.1 +++ b/release/=announce-0.1 @@ -2,7 +2,9 @@ I am pleased to announce version 0.1 of the GNU Hurd, available via anonymous FTP from prep.ai.mit.edu [18.159.0.42] in the file -/pub/gnu/hurd-0.1.tar.gz (about 1.2 MB compressed). +/pub/gnu/hurd-0.1.tar.gz (about 1.2 MB compressed). There is also a +patch file of diffs from the 0.0 release in +/pub/gnu/hurd-0.0-0.1-diff.gz (about 75 KB compressed). (The GNU Hurd, plus Mach, is a kernel, not an operating system. The GNU operating system, like the Unix operating system, consists of many @@ -62,7 +64,7 @@ Hurd utilities and other programs: boot, shd, ps, settrans, showtrans, sync, su, mount, fsysopts, storeinfo, login, w, uptime, hurdids, loginpr, sush, vmstat, portinfo, devprobe, reboot, halt, fsck, fsck.ufs, mkfs.ufs, clri.ufs, - stati.ufs, getty, rc, e2os, vminfo. + stati.ufs, getty, rc, e2os, vminfo, nfsd. Thomas Bushnell, n/BSG diff --git a/sutils/ChangeLog b/sutils/ChangeLog index 4c91f33c..45fd0280 100644 --- a/sutils/ChangeLog +++ b/sutils/ChangeLog @@ -1,3 +1,12 @@ +Tue Sep 17 12:36:09 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile ($(prefix)/dev/MAKEDEV): Depend on $(prefix)/dev. + ($(prefix)/dev): New target. + +Thu Sep 12 16:38:11 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + Sun Sep 8 13:57:34 1996 Miles Bader <miles@gnu.ai.mit.edu> * MAKEDEV.sh: New file. diff --git a/sutils/Makefile b/sutils/Makefile index 47209a68..d2164a3d 100644 --- a/sutils/Makefile +++ b/sutils/Makefile @@ -28,6 +28,7 @@ SRCS = reboot.c halt.c fsck.c fstab.c clookup.c $(SCRIPTS) LCLHDRS = fstab.h DIST_FILES = MAKEDEV.sh +HURDLIBS=shouldbeinlibc OBJS = $(filter-out $(SCRIPTS),$(SRCS:.c=.o)) include ../Makeconf @@ -40,8 +41,11 @@ reboot halt fsck: ../libshouldbeinlibc/libshouldbeinlibc.a $(filter-out $(special-targets), $(targets)): %: %.o -$(prefix)/dev/MAKEDEV: MAKEDEV +$(prefix)/dev/MAKEDEV: MAKEDEV $(prefix)/dev $(INSTALL_PROGRAM) MAKEDEV $(prefix)/dev/MAKEDEV %: %.sh $(top_srcdir)/sh-version.sed sed -f $(top_srcdir)/sh-version.sed < $< > $@ + +$(prefix)/dev: + $(MKINSTALLDIRS) $@ diff --git a/term/ChangeLog b/term/ChangeLog index c6a02d5a..624ef650 100644 --- a/term/ChangeLog +++ b/term/ChangeLog @@ -1,3 +1,8 @@ +Thu Sep 12 16:34:37 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + (OBJS): Don't list libraries here. + Thu Aug 29 17:26:37 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * devio.c (device_open_reply): After error from ports_create_port, diff --git a/term/Makefile b/term/Makefile index 8d224f9e..54c484df 100644 --- a/term/Makefile +++ b/term/Makefile @@ -26,6 +26,7 @@ SRCS = devio.c munge.c users.c main.c ptyio.c LCLHDRS = term.h DIST_FILES = ourmsg.defs -OBJS = $(subst .c,.o,$(SRCS)) termServer.o device_replyServer.o tioctlServer.o ourmsgUser.o ../libtrivfs/libtrivfs.a ../libfshelp/libfshelp.a ../libports/libports.a ../libihash/libihash.a ../libthreads/libthreads.a +HURDLIBS=trivfs fshelp ports ihash threads +OBJS = $(subst .c,.o,$(SRCS)) termServer.o device_replyServer.o tioctlServer.o ourmsgUser.o include ../Makeconf diff --git a/trans/ChangeLog b/trans/ChangeLog index 475cd839..4ca0559c 100644 --- a/trans/ChangeLog +++ b/trans/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 12 16:39:47 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + Fri Jul 12 23:02:36 1996 Michael I. Bushnell, p/BSG <mib@gnu.ai.mit.edu> * crash.c (stop_pgrp): Fetch pgrp using correct call. diff --git a/trans/Makefile b/trans/Makefile index 3ba15844..5b5c51cd 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -22,6 +22,7 @@ targets = symlink ifsock magic null fifo new-fifo fwd devport crash SRCS = ifsock.c symlink.c magic.c null.c fifo.c new-fifo.c fwd.c devport.c \ crash.c OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o +HURDLIBS=ports trivfs threads fshelp pipe ihash shouldbeinlibc include ../Makeconf 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) diff --git a/utils/ChangeLog b/utils/ChangeLog index f55b5f0c..61630be6 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 12 16:37:42 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> + + * Makefile (HURDLIBS): New variable. + Thu Sep 5 11:45:58 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * Makefile: Use $(top_srcdir)/sh-version.h to make executables diff --git a/utils/Makefile b/utils/Makefile index 5079d0c6..4a9ebfd5 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -27,6 +27,7 @@ SRCS = shd.c ps.c su.c settrans.c sync.c showtrans.c \ uptime.sh psout.c hurdids.c vmstat.c portinfo.c devprobe.c vminfo.c LCLHDRS = psout.h +HURDLIBS=ps ihash store fshelp ports threads shouldbeinlibc OBJS = $(filter-out loginpr.sh mount.sh sush.sh uptime.sh,$(SRCS:.c=.o)) login-LDLIBS = -lutil |