Cope with moved changelogs.

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 51973746df5c1ea4f3fac3f79fc976433ecad078..bfa02cd7a772f40a9a41e59a0e7011bd0bf320fd 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,8 +16,11 @@
 #  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)"'
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
@@ -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,45 @@ 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:                daemon.o parserlexer.o ddebug.o lib.o
+daemon:                overlord.o process.o servexec.o parserlexer.o debug.o lib.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 version.h
+
+process.o:     config.h common.h pcsum.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
-               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/../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 +106,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)
@@ -104,8 +129,9 @@ shipprep:   $(SHIPTARGETS)
 ship:          $(SHIPTARGETS)
                rm -rf shipcheck
                mkdir -p shipcheck/userv-$(VERSION)
-               cp -av $^ shipcheck/userv-$(VERSION)
-               GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+               cp -a $^ shipcheck/userv-$(VERSION)
+               cd shipcheck && \
+                GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
                rm -rf shipcheck/userv-$(VERSION)
 
 linecount:     $(SOURCES)
@@ -115,7 +141,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 $@