X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=4ef8e7dbbb08a81749ade47ed69b985693dd088f;hp=2a85e6106bb5f49a2cd20673f823ba09e1430a3a;hb=5043c988440a119e4f773c967be19a829582b8ba;hpb=6fa840b6d85a9d2bde633c1bd2a3021b5e2d21bf

diff --git a/Makefile.in b/Makefile.in
index 2a85e61..4ef8e7d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,13 +38,14 @@ etcdir=/etc
 etcsubdir=$(etcdir)/userv
 
 SOURCES=	Makefile.in configure.in acconfig.h			\
-		client.c common.h					\
-		daemon.c daemon.h ddebug.c parser.c lib.c lib.h		\
+		client.c common.h version.h				\
+		overlord.c process.c servexec.c 			\
+		daemon.h debug.c parser.c lib.c lib.h			\
 		language.i4 lexer.l.m4 tokens.h.m4
 ALSOSHIP=	system.default system.override \
 		spec.sgml overview.fig overview.ps \
-		COPYING buildship install-sh .cvsignore
-GENSHIP=	lexer.l lexer.c tokens.h pcsum.h configure config.h.in \
+		COPYING INSTALL buildship install-sh .cvsignore
+GENSHIP=	lexer.l lexer.c tokens.h configure config.h.in \
 		spec.html spec.ps overview.ps
 
 SHIPTARGETS=	$(SOURCES) $(ALSOSHIP) $(GENSHIP)
@@ -60,25 +61,31 @@ install:	all
 		if ! test -f $(etcsubdir)/system.override; then \
 			$(INSTALL_DATA) -o root -g root system.override $(etcsubdir); fi
 
-daemon:		daemon.o parserlexer.o ddebug.o lib.o
+daemon:		overlord.o process.o servexec.o parserlexer.o debug.o lib.o
+		$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 lexer.l:	language.i4
 
-client.o:	config.h common.h pcsum.h
+client.o:	config.h common.h pcsum.h version.h
 
-daemon.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+process.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+
+overlord.o:	config.h common.h pcsum.h daemon.h
+
+servexec.o:	config.h common.h pcsum.h daemon.h lib.h version.h
 
 lib.o:		config.h lib.h
 
-ddebug.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+debug.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
 
 parserlexer.o:	lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.h
 # lexer.c #include's parser.c at the end.  Blame flex.
 		$(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
-pcsum.h:	common.h
-		md5sum common.h | perl -pe 's/../0x$$&,/g; s/,$$//;' \
-			>pcsum.h.new && mv pcsum.h.new pcsum.h
+pcsum.h:	common.h version.h config.h config.status Makefile
+		cat $^ | md5sum | sed -e 's/../0x&,/g; s/,$$//;' >pcsum.h.new
+		cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
+		@rm -f pcsum.h.new
 
 tokens.h:	language.i4
 
@@ -103,9 +110,10 @@ shipprep:	$(SHIPTARGETS)
 
 ship:		$(SHIPTARGETS)
 		rm -rf shipcheck
-		mkdir shipcheck/userv-$(VERSION)
-		cp -av $^ shipcheck/userv-$(VERSION)
-		GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+		mkdir -p shipcheck/userv-$(VERSION)
+		cp -a $^ shipcheck/userv-$(VERSION)
+		cd shipcheck && \
+		 GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
 		rm -rf shipcheck/userv-$(VERSION)
 
 linecount:	$(SOURCES)