chiark
/
gitweb
/
~ian
/
userv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build fixes.
[userv.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index 2a85e6106bb5f49a2cd20673f823ba09e1430a3a..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.
# 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@
CC=@CC@
-CFLAGS=@CFLAGS@ $(XCFLAGS)
+CFLAGS=@CFLAGS@ $(XCFLAGS)
-DVERSION='"$(VERSION)"'
OPTIMISE=@OPTIMISE@
CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
OPTIMISE=@OPTIMISE@
CPPFLAGS=@DEBUGDEFS@ $(XCPPFLAGS)
LDLIBS=@DEBUGLIBS@ $(XLDLIBS)
@@
-39,13
+41,14
@@
etcsubdir=$(etcdir)/userv
SOURCES= Makefile.in configure.in acconfig.h \
client.c common.h \
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 \
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
+ 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.
sgml spec.
html spec.ps overview.ps
SHIPTARGETS= $(SOURCES) $(ALSOSHIP) $(GENSHIP)
SHIPTARGETS= $(SOURCES) $(ALSOSHIP) $(GENSHIP)
@@
-60,25
+63,38
@@
install: all
if ! test -f $(etcsubdir)/system.override; then \
$(INSTALL_DATA) -o root -g root system.override $(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
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
-
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 $@
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
tokens.h: language.i4
@@
-103,9
+119,10
@@
shipprep: $(SHIPTARGETS)
ship: $(SHIPTARGETS)
rm -rf shipcheck
ship: $(SHIPTARGETS)
rm -rf shipcheck
- mkdir shipcheck/userv-$(VERSION)
- cp -av $^ shipcheck/userv-$(VERSION)
- GZIP=-9v tar zvvcCf shipcheck userv-$(VERSION).tar.gz userv-$(VERSION)
+ 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)
linecount: $(SOURCES)
rm -rf shipcheck/userv-$(VERSION)
linecount: $(SOURCES)
@@
-115,7
+132,7
@@
linecount: $(SOURCES)
rm -rf $@; debiandoc2html $<
%.ps: %.sgml
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 $@
%.ps: %.fig
fig2dev -L ps -c -l dummy -P -z A4 $< >$@.new && mv $@.new $@