Document locations of required programs.

[userv.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 03e99ede4420efb354e99d6ef2d090e28b76c95a..593daec90c824db00fb576e5e125fd3d8a096b9a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,9 +17,10 @@
 #  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)
@@ -58,13 +59,17 @@ 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:                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
@@ -73,9 +78,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