chiark / gitweb /
Bugfixing ...
[userv.git] / Makefile.in
index 337858dd88104b8924c9be96cc91cd56bb73faa2..dfc8e1dfe9526636bdb91d169772dee093bd1e8f 100644 (file)
@@ -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
 #  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)"' $(WERROR)
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
-LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
+LDLIBS=@DEBUGLIBS@ @LIBS@ $(XLDLIBS)
 
 M4=m4
 M4FLAGS=
 LEX=flex
 CWD=$(shell pwd)
 
+INSTALL_GROUP=root
+INSTALL_FLAGS=-u 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
 sbindir=$(exec_prefix)/sbin
 etcdir=/etc
 etcsubdir=$(etcdir)/userv
+docdir=$(prefix)/userv
+
+TARGETS=       daemon client
+TARGETS_DOC_PS=        spec.ps overview.ps
+TARGETS_DOC=   spec.html/index.html $(TARGETS_DOC_PS)
 
 SOURCES=       Makefile.in configure.in acconfig.h                     \
                client.c common.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=      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)
+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
-
-daemon:                overlord.o process.o servexec.o parserlexer.o debug.o lib.o
+               $(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_DATA) -m 644 $(TARGETS_DOC_PS) $(docdir)/.
+               $(INSTALL_DATA) -m 644 spec.html/*.html $(docdir)/spec.html/.
+
+uninstall:
+               rm -f $(bindir)/userv $(sbindir)/uservd
+
+uninstall-doc:
+               cd $docdir && rm -rf $(TARGETS_DOC)
+
+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 +97,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
 
@@ -90,7 +114,7 @@ parserlexer.o:       lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
                $(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
 pcsum.h:       common.h config.h config.status Makefile
-               cat $^ | md5sum | sed -e 's/../0x&,/g; s/,$$//;' >pcsum.h.new
+               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
 
@@ -99,32 +123,42 @@ version.h: Makefile
 
 tokens.h:      language.i4
 
+               rm -f *.o *~ core ./#*#
+
 autoconf configure:
                autoheader
                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 shipcheck
-               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)
+               find -name '*.orig' -o -name '*~' -o -name '.*~' \
+                       -o -name '*#' -o -name '.#*' -o -name '*.bak' \
+                       | xargs -r rm
+               rm -rf $(TARGETS) *.o
+               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.status config.log Makefile config.h config.cache pcsum.h
+
+maintainer-clean:      distclean
+               rm -rf $(GENSHIP_CLEAN) spec.html/*.html
+
+dist-prep:     $(GENSHIP) distclean
+
+dist_tmp=dist_tmp/userv-$(VERSION)
+dist_prune=\( -name CVS -o -name 'dist_tmp*' -o -name slash-etc -o -name vd \)
+dist:                  dist-prep
+       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 $^