X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=Makefile.in;h=6bf4ea49dc672e353294080f66646307b0fa8387;hb=a4089e2b1d4e3f503f426189fc2d03e6fece2df5;hp=08b06112b0268f5318723bdc227fa0483a6e63cc;hpb=db59ee1476515a65cfcca10a3059d8ccb2d24d32;p=userv.git

diff --git a/Makefile.in b/Makefile.in
index 08b0611..6bf4ea4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,10 +16,11 @@
 #  along with userv; if not, write to the Free Software
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-VERSION=0.55
+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)
@@ -44,9 +45,10 @@ SOURCES=	Makefile.in configure.in acconfig.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 \
+ALSOSHIP=	README INSTALL Changelog COPYING \
+		system.default system.override \
 		spec.sgml.in overview.fig overview.ps \
-		COPYING INSTALL buildship install-sh .cvsignore
+		buildship install-sh .cvsignore
 GENSHIP=	lexer.l lexer.c tokens.h configure config.h.in \
 		spec.sgml spec.html spec.ps overview.ps
 
@@ -57,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
@@ -72,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
 
@@ -103,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)
@@ -132,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 $@