# 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=
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) -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 \
+ 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
+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
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
$(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