X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=b4554c8bdd5bda467a5d6838c29bc58ce93d8e86;hb=83776a3a51b4cfb71f2ec19401b4ada9bd9ac0fd;hp=2aaa0de71ae99cd3fb8c9a2c6363c4b0386bb873;hpb=5a8bd30ddb83d2588f617df6c2024ddd20345e2b;p=citadel.git diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 2aaa0de71..b4554c8bd 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -20,6 +20,7 @@ DATA_DIR=@MAKE_DATA_DIR@ STATICDATA_DIR=@MAKE_STATICDATA_DIR@ DOC_DIR=@MAKE_DOC_DIR@ UTILBIN_DIR=@MAKE_UTILBIN_DIR@ +DEPEND_FLAG=@DEPEND_FLAG@ all: $(TARGETS) .SUFFIXES: .o .d .c @@ -28,50 +29,14 @@ EXEEXT=@EXEEXT@ CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT) SERVER_TARGETS=citserver -SERV_MODULES=modules/chat/serv_chat.o \ - modules/upgrade/serv_upgrade.o \ - modules/smtp/serv_smtp.o \ - modules/spam/serv_spam.o \ - modules/pop3/serv_pop3.o \ - modules/vcard/serv_vcard.o \ - vcard.o \ - modules/mrtg/serv_mrtg.o \ - modules/imap/serv_imap.o \ - modules/imap/imap_fetch.o \ - modules/imap/imap_misc.o \ - modules/imap/imap_search.o \ - modules/imap/imap_store.o \ - modules/imap/imap_acl.o \ - modules/imap/imap_metadata.o \ - modules/imap/imap_tools.o \ - modules/imap/imap_list.o \ - modules/fulltext/serv_fulltext.o \ - modules/fulltext/ft_wordbreaker.o \ - crc16.o \ - modules/network/serv_network.o \ - modules/listsub/serv_listsub.o \ - modules/netfilter/serv_netfilter.o \ - modules/newuser/serv_newuser.o \ - modules/notes/serv_notes.o \ - modules/pas2/serv_pas2.o \ +SERV_MODULES=crc16.o \ md5.o \ - modules/inetcfg/serv_inetcfg.o \ - modules/rwho/serv_rwho.o \ - modules/bio/serv_bio.o \ - modules/expire/serv_expire.o \ - modules/vandelay/serv_vandelay.o \ - modules/calendar/serv_calendar.o \ - modules/crypto/serv_crypto.o \ - modules/sieve/serv_sieve.o \ - modules/managesieve/serv_managesieve.o \ - ical_dezonify.o \ - modules/ldap/serv_ldap.o \ - modules/autocompletion/serv_autocompletion.o \ - modules/funambol/serv_funambol.o \ - modules/test/serv_test.o + ical_dezonify.o + +include Make_modules UTIL_TARGETS=aidepost msgform \ - citmail userlist sendcommand \ + citmail userlist sendcommand getmail\ UTILBIN_TARGETS= base64 setup chkpw chkpwd @@ -108,55 +73,20 @@ SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \ clientsocket.c commands.c config.c control.c $(DATABASE) \ domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \ housekeeping.c html.c ical_dezonify.c \ - internet_addressing.c \ + internet_addressing.c ecrash.c \ ipc_c_tcp.c locate_host.c md5.c messages.c \ - modules/autocompletion/serv_autocompletion.c \ - mime_parser.c msgbase.c msgform.c parsedate.c policy.c \ - room_ops.c rooms.c routines.c routines2.c euidindex.c \ - screen.c sendcommand.c \ - modules/bio/serv_bio.c \ - modules/calendar/serv_calendar.c \ - modules/chat/serv_chat.c \ - modules/crypto/serv_crypto.c \ - modules/expire/serv_expire.c \ - modules/imap/serv_imap.c \ - modules/imap/imap_search.c \ - modules/imap/imap_store.c \ - modules/imap/imap_tools.c \ - modules/imap/imap_fetch.c \ - modules/imap/imap_misc.c \ - modules/imap/imap_acl.c \ - modules/imap/imap_list.c \ - modules/imap/imap_metadata.c \ - modules/inetcfg/serv_inetcfg.c \ - modules/listsub/serv_listsub.c \ - modules/mrtg/serv_mrtg.c \ - modules/netfilter/serv_netfilter.c \ - modules/network/serv_network.c \ - modules/ldap/serv_ldap.c \ - modules/newuser/serv_newuser.c \ - modules/pas2/serv_pas2.c \ - modules/pop3/serv_pop3.c \ - modules/rwho/serv_rwho.c \ - modules/smtp/serv_smtp.c \ - modules/spam/serv_spam.c \ - modules/upgrade/serv_upgrade.c \ - modules/vandelay/serv_vandelay.c \ - modules/vcard/serv_vcard.c \ - modules/managesieve/serv_managesieve.c \ + msgbase.c msgform.c parsedate.c policy.c \ + room_ops.c rooms.c routines.c routines2.c tuiconfig.c euidindex.c \ + screen.c sendcommand.c getmail.c \ server_main.c \ - modules/sieve/serv_sieve.c \ - modules/funambol/serv_funambol.c \ setup.c snprintf.c \ - stress.c support.c sysdep.c tools.c user_ops.c userlist.c \ - whobbs.c vcard.c \ - modules/notes/serv_notes.c \ - modules/fulltext/serv_fulltext.c \ - modules/fulltext/ft_wordbreaker.c \ - crc16.c journaling.c citadel_dirs.c \ - modules/test/serv_test.c + stress.c support.c sysdep.c user_ops.c userlist.c \ + whobbs.c \ + crc16.c journaling.c citadel_dirs.c threads.c + +include Make_sources -DEP_FILES=$(SOURCES:.c=.d) modules_init.d +DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d client: $(CLIENT_TARGETS) @@ -166,10 +96,10 @@ 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 \ - routines2.o screen.o tools.o citadel_dirs.o $(LIBOBJS) + routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) $(CC) 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 \ - routines2.o screen.o tools.o citadel_dirs.o $(LIBOBJS) \ + routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) \ $(LDFLAGS) -o citadel $(LIBS) .y.c: @@ -181,18 +111,24 @@ citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \ parsedate.o: parsedate.c -modules_init.c: mk_module_init.sh $(SOURCES) - $(srcdir)/mk_module_init.sh +Make_sources: modules_init.c + +Make_modules: modules_init.c + +modules_upgrade.c: modules_init.c + +modules_init.c: mk_module_init.sh $(SOURCES) + $(srcdir)/mk_module_init.sh SERV_OBJS = server_main.o \ user_ops.o citserver.o sysdep.o serv_extensions.o \ - tools.o $(DATABASE:.c=.o) domain.o \ + $(DATABASE:.c=.o) domain.o \ control.o policy.o config.o support.o room_ops.o \ file_ops.o msgbase.o euidindex.o \ - locate_host.o housekeeping.o mime_parser.o html.o \ + locate_host.o housekeeping.o html.o \ internet_addressing.o journaling.o \ - parsedate.o genstamp.o \ - clientsocket.o modules_init.o $(AUTH) $(SERV_MODULES) + parsedate.o genstamp.o ecrash.o threads.o\ + clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) citserver: $(SERV_OBJS) $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver @@ -203,12 +139,12 @@ citserver: $(SERV_OBJS) aidepost: aidepost.o config.o $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost $(LIBS) -citmail: citmail.o citadel_dirs.o tools.o - $(CC) citmail.o citadel_dirs.o tools.o $(LDFLAGS) -o citmail $(LIBS) +citmail: citmail.o citadel_dirs.o + $(CC) citmail.o citadel_dirs.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 - $(CC) setup.o tools.o citadel_dirs.o $(LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS) +setup: setup.o citadel_dirs.o + $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup $(LIBS) $(SETUP_LIBS) chkpwd: chkpwd.o auth.o $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS) @@ -216,21 +152,25 @@ chkpwd: chkpwd.o auth.o chkpw: chkpw.o auth.o citadel_dirs.o $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw $(chkpwd_LIBS) -whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) - $(CC) whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(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) -stress$(EXEEXT): stress.o ipc_c_tcp.o tools.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) - $(CC) stress.o ipc_c_tcp.o tools.o citadel_ipc.o citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o stress $(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) -sendcommand: sendcommand.o ipc_c_tcp.o citadel_ipc.o tools.o config.o $(LIBOBJS) - $(CC) sendcommand.o ipc_c_tcp.o citadel_ipc.o tools.o config.o \ +sendcommand: 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) +getmail: 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) + base64: base64.o $(CC) base64.o $(LDFLAGS) -o base64 -userlist: userlist.o ipc_c_tcp.o citadel_ipc.o tools.o citadel_dirs.o $(LIBOBJS) - $(CC) userlist.o ipc_c_tcp.o citadel_ipc.o tools.o citadel_dirs.o \ +userlist: 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) msgform: msgform.o @@ -335,7 +275,10 @@ install-exec: all $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ fi \ done - @for i in utilsmenu database_cleanup.sh citadel-openldap.schema; do \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/unstripped + cp $(SERVER_TARGETS) $(DESTDIR)$(prefix)/unstripped/ + + @for i in utilsmenu database_cleanup.sh migrate_aliases.sh citadel-openldap.schema; do \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ @@ -354,6 +297,8 @@ install-exec-new: all $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \ fi \ done + cp citserver $(DESTDIR)/$(UTILBIN_DIR)/citserver.unstripped + cp migrate_aliases.sh $(DESTDIR)/$(UTILBIN_DIR)/ @for i in $(UTILBIN_TARGETS); do \ if test -f $$i; then \ echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \ @@ -385,7 +330,7 @@ clean: cleaner: clean rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) database_cleanup.sh *.la - rm -rf modules_init.c modules_init.h + rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources distclean: cleaner find . -name '*~' -o -name '.#*' | xargs rm -f @@ -396,7 +341,7 @@ distclean: cleaner .c.d: @echo Checking dependencies for $< - @$(CC) -M $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@ + @$(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@ @test -s $@ || rm -f $@ Makefile: $(srcdir)/Makefile.in config.status