X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=90972fd4717b2a74eb6277b0fc747d36e0a655af;hp=115ab4ab78256a6c7080b226c750d5e4e41da381;hb=af5c97dd0b7e37e1fb3ad1f7ac81fa31a48be7f8;hpb=25fb518076d49f38e12431861e3cb8dd050955ed

diff --git a/Makefile.in b/Makefile.in
index 115ab4a..90972fd 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,69 +16,122 @@
 #  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=
 LEX=flex
+MD5SUM=@MD5SUM_SIMPLE@
 CWD=$(shell pwd)
 
+INSTALL_GROUP=root
+INSTALL_FLAGS=-o root -g $(INSTALL_GROUP)
+
 INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@
-INSTALL_DATA=@INSTALL_DATA@
+INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_FLAGS)
+INSTALL_DATA=@INSTALL_DATA@ $(INSTALL_FLAGS)
 prefix=@prefix@
 exec_prefix=$(prefix)
 bindir=$(exec_prefix)/bin
+mandir=$(prefix)/man
+man1dir=$(mandir)/man1
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
+docdir=$(prefix)/userv
+
+TARGETS=	daemon client
+TARGETS_DOC_PS=	spec.ps overview.ps
+TARGETS_DOC_RM=	$(TARGETS_DOC_PS) spec.html
+TARGETS_DOC=	$(TARGETS_DOC_PS) spec.html/index.html
+MAN1PAGES=	userv.1
 
 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 \
-		spec.html spec.ps overview.ps
 
-SHIPTARGETS=	$(SOURCES) $(ALSOSHIP) $(GENSHIP)
+CONFIG_RESULTS=	config.status config.log config.h config.cache \
+		Makefile pcsum.h
+
+GENSHIP_CLEAN=	lexer.l lexer.c tokens.h config.h.in spec.sgml $(TARGETS_DOC)
+GENSHIP=	$(GENSHIP_CLEAN) configure
+
+all:		$(TARGETS)
 
-all:		daemon client
+docs:		$(TARGETS_DOC)
 
 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_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
+		$(INSTALL_PROGRAM) -m 755 daemon $(sbindir)/uservd
+		$(INSTALL_PROGRAM) -m 4755 client $(bindir)/userv
+		$(INSTALL) -d -m 2755 $(etcsubdir) \
+	$(etcsubdir)/default.d $(etcsubdir)/services.d $(etcsubdir)/override.d
+		if test ! -f $(etcsubdir)/system.default; then \
+			$(INSTALL_DATA) system.default $(etcsubdir); fi
+		if test ! -f $(etcsubdir)/system.override; then \
+			$(INSTALL_DATA) system.override $(etcsubdir); fi
+
+install-strip:
+		$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
+install-doc:	$(TARGETS_DOC)
+		$(INSTALL) -d -m 2755 $(docdir) $(docdir)/spec.html
+		$(INSTALL) -d -m 2755 $(mandir) $(man1dir)
+		$(INSTALL_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
+		$(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+		$(INSTALL_DATA) -m 644 $(MAN1PAGES) $(man1dir)
+
+uninstall:
+		rm -f $(bindir)/userv $(sbindir)/uservd
+
+uninstall-doc:
+		cd $docdir && rm -rf $(TARGETS_DOC_RM)
 
-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
+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
 
-daemon.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+overlord.o:	config.h common.h pcsum.h daemon.h
 
-lib.o:		config.h lib.h
+servexec.o:	config.h common.h pcsum.h daemon.h lib.h version.h
 
-ddebug.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
+lib.o:		config.h common.h lib.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 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,34 +140,48 @@ 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 *.o *~ core ./#*#
-
-distclean:	clean
-		rm -f config.status config.log Makefile config.h
-
-realclean:	distclean
-		rm -f configure config.h.in
-
-shipprep:	$(SHIPTARGETS)
-
-ship:		$(SHIPTARGETS)
-		rm -rf d && mkdir d && cp -av $^ d
-		mv d userv-$(VERSION)
-		GZIP=-9v tar zvvcf ../userv-$(VERSION).tar.gz userv-$(VERSION)
-		rm -rf userv-$(VERSION)
+		find -name '*.orig' -o -name '*~' -o -name '.*~' \
+			-o -name '*#' -o -name '.#*' -o -name '*.bak' \
+			| xargs -r rm
+		rm -rf $(TARGETS) *.o core version.h
+		rm -f overview.eps
+		rm -f spec.lout* spec.text* spec.ps?* spec.sgml.new
+		rm -f lout.li *.ld *.lix *.ldx
+		rm -f userv-*.tar.gz vd/*
+
+distclean mostlyclean:	clean
+		rm -f $(CONFIG_RESULTS)
+
+maintainer-clean:	distclean
+		rm -rf $(GENSHIP_CLEAN) spec.html/*.html
+
+dist-prep:	$(GENSHIP)
+
+pre-checkin:
+		./configure
+		$(MAKE) dist-prep
+
+dist_tmp=dist_tmp/userv-$(VERSION)
+dist_prune=\( -name CVS -o -name 'dist_tmp*' -o -name slash-etc -o -name vd \)
+dist:			dist-prep distclean
+	rm -rf dist_tmp*
+	mkdir dist_tmp $(dist_tmp)
+	find $(dist_prune) -prune -o -type d -print | \
+		sed -e 's#.*#mkdir -p $(dist_tmp)/&#' | sh
+	find $(dist_prune) -prune -o -type f -print | \
+		sed -e 's#.*#ln & $(dist_tmp)/&#' | sh
+	cd dist_tmp && tar cf ../$(dist_tmp).tar `basename $(dist_tmp)`
+	gzip -9 $(dist_tmp).tar
+	mv $(dist_tmp).tar.gz .
 
 linecount:	$(SOURCES)
 		wc -l $^
 
-%.html:		%.sgml
-		rm -rf $@; debiandoc2html $<
+%.html/index.html:	%.sgml
+			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 $@