* move arround some files in the configured build according to the suggestions of...

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 66148adaaf181c4aa6af94f6b4020bb38f9c771e..28922f258d1bab5366fc8da21d7f87384c1fe9fe 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -18,7 +18,9 @@ RUN_DIR=@MAKE_RUN_DIR@
 SPOOL_DIR=@MAKE_SPOOL_DIR@
 ETC_DIR=@MAKE_ETC_DIR@
 DATA_DIR=@MAKE_DATA_DIR@
+STATICDATA_DIR=@MAKE_STATICDATA_DIR@
 DOC_DIR=@MAKE_DOC_DIR@
+UTILBIN_DIR=@MAKE_UTILBIN_DIR@
 all: $(TARGETS)
 
 .SUFFIXES: .o .d .c
@@ -26,7 +28,7 @@ all: $(TARGETS)
 EXEEXT=@EXEEXT@
 
 CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
-SERVER_TARGETS=citserver setup $(CHKPWD)
+SERVER_TARGETS=citserver $(CHKPWD)
 SERV_MODULES=serv_chat.o \
        serv_upgrade.o \
        serv_smtp.o \
@@ -35,7 +37,7 @@ SERV_MODULES=serv_chat.o \
        serv_vcard.o vcard.o \
        serv_mrtg.o \
        serv_imap.o imap_fetch.o imap_misc.o imap_search.o \
-               imap_store.o imap_tools.o \
+               imap_store.o imap_acl.o imap_tools.o imap_list.o \
        serv_fulltext.o ft_wordbreaker.o crc16.o \
        serv_network.o \
        serv_listsub.o \
@@ -53,11 +55,13 @@ SERV_MODULES=serv_chat.o \
        serv_managesieve.o \
        ical_dezonify.o \
        serv_ldap.o \
-       serv_autocompletion.o 
+       serv_autocompletion.o \
+       serv_funambol.o
 
 UTIL_TARGETS=aidepost msgform \
        citmail userlist sendcommand \
-       base64
+
+UTILBIN_TARGETS= base64 setup
 
 prefix=@prefix@
 srcdir=@srcdir@
@@ -67,8 +71,8 @@ AUTH=@AUTH@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I.
+CFLAGS=@CFLAGS@ -I ./include/
+CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
 DEFS=@DEFS@
 LDFLAGS=@LDFLAGS@
@@ -102,10 +106,10 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
        serv_newuser.c serv_pas2.c serv_pop3.c serv_rwho.c serv_smtp.c \
        serv_spam.c serv_test.c serv_mrtg.c serv_spam.c serv_upgrade.c \
        serv_vandelay.c serv_vcard.c serv_managesieve.c server_main.c \
-       serv_sieve.c setup.c snprintf.c \
+       serv_sieve.c serv_funambol.c setup.c snprintf.c imap_acl.c \
        stress.c support.c sysdep.c tools.c user_ops.c userlist.c \
        whobbs.c vcard.c serv_notes.c serv_fulltext.c ft_wordbreaker.c \
-       crc16.c journaling.c citadel_dirs.c
+       crc16.c journaling.c citadel_dirs.c imap_list.c
 
 DEP_FILES=$(SOURCES:.c=.d)
 
@@ -113,7 +117,7 @@ client: $(CLIENT_TARGETS)
 
 server: $(SERVER_TARGETS) $(SERV_MODULES)
 
-utils: $(UTIL_TARGETS)
+utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 
 citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \
        commands.o html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \
@@ -151,8 +155,8 @@ citserver: $(SERV_OBJS)
 aidepost: aidepost.o config.o
        $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost $(LIBS)
 
-citmail: citmail.o config.o citadel_dirs.o
-       $(CC) citmail.o config.o citadel_dirs.o $(LDFLAGS) -o citmail $(LIBS)
+citmail: citmail.o citadel_dirs.o tools.o
+       $(CC) citmail.o citadel_dirs.o tools.o $(LDFLAGS) -o citmail $(LIBS)
 
 # setup does need LIBS defined, because it uses network functions which are in -lsocket -lnsl on Solaris.
 setup: setup.o tools.o citadel_dirs.o
@@ -226,12 +230,12 @@ 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)$(ETC_DIR)/help
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/messages
+       $(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 \
-               echo $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
-               $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
+               echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
+               $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
@@ -275,7 +279,7 @@ install-exec: all
        @for i in bio bitbucket files images info userpics; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
-       @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS); do \
+       @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
                if test -f $$i; then \
                        echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
                        $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -295,13 +299,20 @@ install-exec: all
 install-exec-new: all
        $(srcdir)/mkinstalldirs $(DESTDIR)/usr/sbin; 
        $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin; 
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR); 
+       $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin; 
+       $(srcdir)/mkinstalldirs $(DESTDIR)$(UTILBIN_DIR); 
        @for i in $(SERVER_TARGETS) $(UTIL_TARGETS); do \
                if test -f $$i; then \
                        echo $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \
                        $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \
                fi \
        done
+       @for i in $(UTILBIN_TARGETS); do \
+               if test -f $$i; then \
+                       echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
+                       $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
+               fi \
+       done
 
        $(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail;
        @for i in $(CLIENT_TARGETS); do \
@@ -329,7 +340,7 @@ cleaner: clean
 
 distclean: cleaner
        find . -name '*~' -o -name '.#*' | xargs rm -f
-       rm -f Makefile sysdep.h config.cache config/.og config.status *.d 
+       rm -f Makefile sysdep.h config.cache config.log config.status *.d 
 
 .c.d:
        @echo Checking dependencies for $<