Build fixes.

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 0df4f955ca62749e77559b35bfffa6a8d2f5cde8..2b2e0d9fe06fbfd9b23414dd8f1f9f254d055ad2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,8 +16,10 @@
 #  along with userv; if not, write to the Free Software
 #  Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+VERSION=0.55
+
 CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS)
+CFLAGS=@CFLAGS@ $(XCFLAGS) -DVERSION='"$(VERSION)"'
 OPTIMISE=@OPTIMISE@
 CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
 LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
@@ -38,15 +40,15 @@ etcdir=/etc
 etcsubdir=$(etcdir)/userv
 
 SOURCES=       Makefile.in configure.in acconfig.h                     \
-               client.c common.h version.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=      system.default system.override \
-               spec.sgml overview.fig overview.ps \
+               spec.sgml.in overview.fig overview.ps \
                COPYING INSTALL buildship install-sh .cvsignore
 GENSHIP=       lexer.l lexer.c tokens.h configure config.h.in \
-               spec.html spec.ps overview.ps
+               spec.sgml spec.html spec.ps overview.ps
 
 SHIPTARGETS=   $(SOURCES) $(ALSOSHIP) $(GENSHIP)
 
@@ -66,15 +68,19 @@ daemon:             overlord.o process.o servexec.o parserlexer.o debug.o lib.o
 
 lexer.l:       language.i4
 
+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
 
-servexec.o:    config.h common.h pcsum.h daemon.h lib.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
 
 debug.o:       config.h common.h pcsum.h daemon.h lib.h tokens.h
 
@@ -82,11 +88,14 @@ parserlexer.o:      lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
 # lexer.c #include's parser.c at the end.  Blame flex.
                $(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
-pcsum.h:       common.h version.h config.h config.status Makefile
+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
 
 autoconf configure:
@@ -123,7 +132,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 $@