X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=6bf4ea49dc672e353294080f66646307b0fa8387;hb=7bc3c582a0a80d34d2c9c86ed9a588b3983e0db1;hp=337858dd88104b8924c9be96cc91cd56bb73faa2;hpb=bd9a742e2fce5aef553339325fd5919ab0b61910;p=userv.git

diff --git a/Makefile.in b/Makefile.in
index 337858d..6bf4ea4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,9 +17,10 @@
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 VERSION=@VERSION@
+VEREXT=std
 
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"'
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"' -DVEREXT='"$(VEREXT)"'
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
@@ -58,13 +59,17 @@ 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)
+		$(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 \
 			$(INSTALL_DATA) -o root -g root system.override $(etcsubdir); fi
 
-daemon:		overlord.o process.o servexec.o parserlexer.o debug.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
@@ -73,9 +78,9 @@ 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 version.h
+client.o:	config.h common.h pcsum.h both.h version.h
 
-process.o:	config.h common.h pcsum.h daemon.h lib.h tokens.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
 
@@ -104,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)