X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=88d8bb5c8c96dd183ccb0c47aa38dec8dffc4a49;hp=9448969914ce7c8975c18a769cfa4ee5fdb46804;hb=d237116707105a3ca6cf367a672bc5263cf7856d;hpb=dbad0a53f8c54ac65c5859d3e213a10821b797ff

diff --git a/Makefile.in b/Makefile.in
index 9448969..88d8bb5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 #  userv - Makefile.in
 #  
-#  Copyright (C)1996-1997 Ian Jackson
+#  Copyright (C)1996-1997,1999 Ian Jackson
 #  
 #  This is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
@@ -16,11 +16,14 @@
 #  along with userv; if not, write to the Free Software
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+VERSION=@VERSION@
+VEREXT=std
+
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS)
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"' $(WERROR)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
-LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
+LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 
 M4=m4
 M4FLAGS=
@@ -39,13 +42,15 @@ 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		\
+		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 \
-		spec.html spec.ps overview.ps
+ALSOSHIP=	README INSTALL Changelog COPYING \
+		system.default system.override \
+		spec.sgml.in overview.fig overview.ps \
+		buildship install-sh .cvsignore
+GENSHIP=	lexer.l lexer.c tokens.h configure config.h.in \
+		spec.sgml spec.html spec.ps overview.ps
 
 SHIPTARGETS=	$(SOURCES) $(ALSOSHIP) $(GENSHIP)
 
@@ -54,31 +59,48 @@ all:		daemon client
 install:	all
 		$(INSTALL_PROGRAM) -s -o root -g root -m 755 daemon $(sbindir)/uservd
 		$(INSTALL_PROGRAM) -s -o root -g root -m 4755 client $(bindir)/userv
-		$(INSTALL) -d -o root -g root -m 2755 $(etcsubdir)
-		if ! test -f $(etcsubdir)/system.default; then \
+		$(INSTALL) -d -o root -g root -m 2755 $(etcsubdir) \
+	$(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
+		if test ! -f $(etcsubdir)/system.default; then \
 			$(INSTALL_DATA) -o root -g root system.default $(etcsubdir); fi
-		if ! test -f $(etcsubdir)/system.override; then \
+		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 both.o
+		$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+
+client:		client.o both.o
+		$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 lexer.l:	language.i4
 
-client.o:	config.h common.h pcsum.h version.h
+spec.sgml:	spec.sgml.in Makefile
+		sed -e '/<version><\/version>/ s/>/&$(VERSION)/' \
+			spec.sgml.in >$@.new && mv -f $@.new $@
+
+client.o:	config.h common.h pcsum.h both.h version.h
+
+process.o:	config.h common.h pcsum.h both.h daemon.h lib.h tokens.h
+
+overlord.o:	config.h common.h pcsum.h daemon.h
 
-daemon.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+servexec.o:	config.h common.h pcsum.h daemon.h lib.h version.h
 
-lib.o:		config.h lib.h
+lib.o:		config.h common.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 version.h config.h config.status Makefile
-		cat $^ | md5sum | perl -pe 's/../0x$$&,/g; s/,$$//;' >pcsum.h.new
+pcsum.h:	common.h config.h config.status Makefile
+		cat $^ | md5sum | sed -e 's/  -$$//; 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
+
+version.h:	Makefile
+		echo '#define VERSION "$(VERSION)"' >$@.new && mv -f $@.new $@
 
 tokens.h:	language.i4
 
@@ -87,16 +109,22 @@ autoconf configure:
 		autoconf
 
 clean:
-		rm -f daemon client lexer.l lexer.c tokens.h pcsum.h
-		rm -f overview.eps overview.ps
-		rm -f spec.lout* spec.ps spec.text* lout.li
-		rm -rf spec.html*
+		rm -f daemon client pcsum.h
+		rm -f overview.eps
+		rm -f spec.lout* spec.text* spec.sgml spec.sgml.new spec.ps?*
+		rm -rf spec.html?*
+		rm -f lout.li *.lix *.ldx config.cache
 		rm -f *.o *~ core ./#*#
 
 distclean:	clean
 		rm -f config.status config.log Makefile config.h
 
 realclean:	distclean
+		rm -f spec.ps* spec.sgml spec.sgml.new
+		rm -f lexer.l lexer.c tokens.h overview.ps
+		rm -rf spec.html*
+
+totalclean:	realclean
 		rm -f configure config.h.in
 
 shipprep:	$(SHIPTARGETS)
@@ -116,7 +144,7 @@ linecount:	$(SOURCES)
 		rm -rf $@; debiandoc2html $<
 
 %.ps:		%.sgml
-		debiandoc2ps -1 -k -O $< >$@.new && mv $@.new $@
+		debiandoc2ps -1 -O $< >$@.new && mv $@.new $@
 
 %.ps:		%.fig
 		fig2dev -L ps -c -l dummy -P -z A4 $< >$@.new && mv $@.new $@