* where did this find get lost?

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 56e48995327cfd7e7c73b13a8fea06eeb636b495..9ea36feddf214d05b8175b93cf6c3f01cdddc992 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -18,6 +18,7 @@ SPOOL_DIR=@MAKE_SPOOL_DIR@
 ETC_DIR=@MAKE_ETC_DIR@
 DATA_DIR=@MAKE_DATA_DIR@
 STATICDATA_DIR=@MAKE_STATICDATA_DIR@
+HELP_DIR=@MAKE_HELP_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
 UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 DEPEND_FLAG=@DEPEND_FLAG@
@@ -54,14 +55,14 @@ CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
 DEFS=@DEFS@
-LDFLAGS=@LDFLAGS@  -Wl,--no-undefined
+LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
-SERVER_LDFLAGS=@SERVER_LDFLAGS@  -Wl,--no-undefined 
+SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
@@ -135,51 +136,51 @@ SERV_OBJS = server_main.o \
        clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
        svn_revision.o
 
-citserver: $(SERV_OBJS)
-       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
+citserver$(EXEEXT): $(SERV_OBJS)
+       $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
 
 .c.o:
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-aidepost: aidepost.o config.o
-       $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost $(LIBS)
+aidepost$(EXEEXT): aidepost.o config.o
+       $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS)
 
-citmail: citmail.o citadel_dirs.o
-       $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail $(LIBS)
+citmail$(EXEEXT): citmail.o citadel_dirs.o
+       $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
 
 # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
-setup: setup.o citadel_dirs.o
-       $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS)
+setup$(EXEEXT): setup.o citadel_dirs.o
+       $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS)
 
-chkpwd: chkpwd.o auth.o
-       $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
+chkpwd$(EXEEXT): chkpwd.o auth.o
+       $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
 
-chkpw: chkpw.o auth.o citadel_dirs.o
-       $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw $(chkpwd_LIBS)
+chkpw$(EXEEXT): chkpw.o auth.o citadel_dirs.o
+       $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
 whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-       $(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o  citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(LIBS)
+       $(CC) whobbs.o ipc_c_tcp.o citadel_ipc.o  citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS)
 
 stress$(EXEEXT): stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
-       $(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress $(LIBS)
+       $(CC) stress.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress$(EXEEXT) $(LIBS)
 
-sendcommand: sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
+sendcommand$(EXEEXT): sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
        $(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o config.o  \
-        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand $(LIBS)
+        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
-getmail: getmail.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
+getmail$(EXEEXT): getmail.o ipc_c_tcp.o citadel_ipc.o config.o  $(LIBOBJS)
        $(CC) getmail.o ipc_c_tcp.o citadel_ipc.o config.o  \
-        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail $(LIBS)
+        citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS)
 
-base64: base64.o
-       $(CC) base64.o $(LDFLAGS) -o base64
+base64$(EXEEXT): base64.o
+       $(CC) base64.o $(LDFLAGS) -o base64$(EXEEXT)
 
-userlist: userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
+userlist$(EXEEXT): userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o $(LIBOBJS)
        $(CC) userlist.o ipc_c_tcp.o citadel_ipc.o citadel_dirs.o \
-       $(LIBOBJS) $(LDFLAGS) -o userlist $(LIBS)
+       $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS)
 
-msgform: msgform.o
-       $(CC) msgform.o $(LDFLAGS) -o msgform
+msgform$(EXEEXT): msgform.o
+       $(CC) msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
@@ -225,13 +226,19 @@ install-data-new:
        $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
        $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
 
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/help
        $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
        @for i in  \
-                `find $(srcdir)/help $(srcdir)/messages  -type f | grep -v .svn`; do \
+                `find $(srcdir)/messages  -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
+
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help
+       @for i in  \
+                `find $(srcdir)/help -type f | grep -v .svn`; do \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \
+       done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/systems