X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=8c3e405bdc27369de8e5c665dfef8379f08c36e8;hb=82fb7a6f7288522abdedd30193579b1a14de091e;hp=ac17fac41a085c4efa0460e444bd986b63acd4f7;hpb=39ada1f5eff58bacae709253386cabb9b2fd7b38;p=citadel.git diff --git a/citadel/Makefile.in b/citadel/Makefile.in index ac17fac41..8c3e405bd 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -8,10 +8,12 @@ # 2. Send e-mail to ajc@uncensored.citadel.org and let me know what you # did, so any necessary changes can be put into the next release. # -# $Id$ -# ######################################################################## +prefix=@prefix@ +srcdir=@srcdir@ +VPATH=$(srcdir) + TARGETS=@TARGETS@ RUN_DIR=@MAKE_RUN_DIR@ SPOOL_DIR=@MAKE_SPOOL_DIR@ @@ -22,7 +24,7 @@ HELP_DIR=@MAKE_HELP_DIR@ DOC_DIR=@MAKE_DOC_DIR@ UTILBIN_DIR=@MAKE_UTILBIN_DIR@ DEPEND_FLAG=@DEPEND_FLAG@ -all: $(TARGETS) +all: buildinfo $(TARGETS) .SUFFIXES: .o .d .c @@ -31,8 +33,7 @@ EXEEXT=@EXEEXT@ CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) NOINST_TARGETS=stress$(EXEEXT) SERVER_TARGETS=citserver$(EXEEXT) -SERV_MODULES=crc16.o \ - md5.o \ +SERV_MODULES= md5.o \ ical_dezonify.o include Make_modules @@ -41,20 +42,18 @@ UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT) UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \ chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \ - getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) + getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \ + ctdlmigrate$(EXEEXT) -prefix=@prefix@ -srcdir=@srcdir@ ACLOCAL=@ACLOCAL@ -AUTH=@AUTH@ AUTOCONF=@AUTOCONF@ chkpwd_LIBS=@chkpwd_LIBS@ CC=@CC@ CFLAGS=@CFLAGS@ -I ./include/ CPPFLAGS=@CPPFLAGS@ -I. -I ./include/ DATABASE=@DATABASE@ -DEFS=@DEFS@ +DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\" LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ LIBOBJS=@LIBOBJS@ @@ -66,32 +65,52 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@ SERVER_LIBS=@SERVER_LIBS@ SETUP_LIBS=@SETUP_LIBS@ YACC=@YACC@ +DIFF=@DIFF@ +PATCH=@PATCH@ +LOCALEDIR=@LOCALEDIR@ # End configuration section -VPATH=$(srcdir) +.SILENT: + -SOURCES=aidepost.c auth.c base64.c chkpwd.c chkpw.c citadel.c citadel_ipc.c \ - citmail.c citserver.c client_chat.c client_passwords.c \ - clientsocket.c commands.c config.c control.c $(DATABASE) \ +SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \ + utils/setup.c utils/msgform.c utils/chkpw.c \ + utils/sendcommand.c utils/getmail.c utils/userlist.c \ + utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \ + utillib/citadel_ipc.c utillib/citadel_dirs.c utillib/ipc_c_tcp.c \ + textclient/client_chat.c textclient/client_passwords.c \ + textclient/commands.c textclient/messages.c textclient/rooms.c \ + textclient/routines.c textclient/routines2.c textclient/tuiconfig.c \ + textclient/citadel.c textclient/screen.c \ + citserver.c clientsocket.c config.c control.c $(DATABASE) \ domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \ - housekeeping.c ical_dezonify.c \ - internet_addressing.c ecrash.c \ - ipc_c_tcp.c locate_host.c md5.c messages.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 \ - setup.c snprintf.c \ - stress.c support.c sysdep.c user_ops.c userlist.c \ - whobbs.c \ - crc16.c journaling.c citadel_dirs.c threads.c + housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \ + locate_host.c md5.c auth.c msgbase.c parsedate.c \ + room_ops.c euidindex.c server_main.c snprintf.c ldap.c \ + support.c sysdep.c user_ops.c journaling.c threads.c \ + context.c event_client.c include Make_sources +# for VPATH builds (invoked by configure) +mkdir-init: + DIRS=`/bin/ls $(VPATH)/modules/` + echo $(DIRS) + @for d in `/bin/ls $(VPATH)/modules/`; do \ + (mkdir -p modules/$$d ) ; \ + done + DIRS=`/bin/ls $(VPATH)/user_modules/` + echo $(DIRS) + @for d in `/bin/ls $(VPATH)/user_modules/`; do \ + (mkdir -p user_modules/$$d ) ; \ + done + mkdir -p utils utillib textclient + mkdir locale + svn_revision.c: ${SOURCES} - ./mk_svn_revision.sh + $(srcdir)/scripts/mk_svn_revision.sh DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d @@ -102,13 +121,19 @@ server: $(SERVER_TARGETS) $(SERV_MODULES) utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS) -citadel$(EXEEXT): citadel.o citadel_ipc.o client_chat.o client_passwords.o \ - commands.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \ - 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 ipc_c_tcp.o md5.o messages.o rooms.o routines.o \ - routines2.o tuiconfig.o screen.o citadel_dirs.o ecrash.o $(LIBOBJS) \ - $(LDFLAGS) -o citadel $(LIBS) +citadel$(EXEEXT): textclient/citadel.o utillib/citadel_ipc.o \ + textclient/client_chat.o textclient/client_passwords.o \ + textclient/commands.o utillib/ipc_c_tcp.o md5.o \ + textclient/messages.o textclient/rooms.o textclient/routines.o \ + textclient/routines2.o textclient/tuiconfig.o \ + textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS) + $(CC) textclient/citadel.o utillib/citadel_ipc.o \ + textclient/client_chat.o textclient/client_passwords.o \ + textclient/commands.o utillib/ipc_c_tcp.o md5.o \ + textclient/messages.o textclient/rooms.o textclient/routines.o \ + textclient/routines2.o textclient/tuiconfig.o \ + textclient/screen.o utillib/citadel_dirs.o ecrash.o $(LIBOBJS) \ + $(LDFLAGS) -o citadel $(LIBS) .y.c: $(YACC) $(YFLAGS) $< @@ -125,72 +150,103 @@ Make_modules: modules_init.c modules_upgrade.c: modules_init.c -SERV_OBJS = server_main.o \ +SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \ user_ops.o citserver.o sysdep.o serv_extensions.o \ $(DATABASE:.c=.o) domain.o \ - control.o policy.o config.o support.o room_ops.o \ + control.o config.o support.o room_ops.o \ file_ops.o msgbase.o euidindex.o \ locate_host.o housekeeping.o \ internet_addressing.o journaling.o \ - parsedate.o genstamp.o ecrash.o threads.o\ - clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \ - svn_revision.o + parsedate.o genstamp.o ecrash.o threads.o context.o \ + clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \ + svn_revision.o ldap.o citserver$(EXEEXT): $(SERV_OBJS) $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT) -.c.o: +%.o: %.c ${HEADERS} + echo "CC $<" $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ -aidepost$(EXEEXT): aidepost.o config.o - $(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) +aidepost$(EXEEXT): utils/aidepost.o config.o + $(CC) utils/aidepost.o config.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) -citmail$(EXEEXT): citmail.o citadel_dirs.o - $(CC) citmail.o citadel_dirs.o $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS) +citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o + $(CC) utils/citmail.o utillib/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$(EXEEXT): setup.o citadel_dirs.o - $(CC) setup.o citadel_dirs.o $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS) - -chkpwd$(EXEEXT): chkpwd.o auth.o - $(CC) chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(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$(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$(EXEEXT) $(LIBS) - -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$(EXEEXT) $(LIBS) - -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$(EXEEXT) $(LIBS) - -base64$(EXEEXT): base64.o - $(CC) base64.o $(LDFLAGS) -o base64$(EXEEXT) - -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$(EXEEXT) $(LIBS) - -msgform$(EXEEXT): msgform.o - $(CC) msgform.o $(LDFLAGS) -o msgform$(EXEEXT) +setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o + $(CC) utils/setup.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_LIBS) + +ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o utillib/citadel_dirs.o + $(CC) utils/ctdlmigrate.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS) + +chkpwd$(EXEEXT): utils/chkpwd.o auth.o + $(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS) + +chkpw$(EXEEXT): utils/chkpw.o auth.o utillib/citadel_dirs.o + $(CC) utils/chkpw.o auth.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS) + +whobbs$(EXEEXT): utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/whobbs.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) \ + $(LDFLAGS) -o whobbs$(EXEEXT) $(LIBS) + +stress$(EXEEXT): utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/stress.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) \ + $(LDFLAGS) -o stress$(EXEEXT) $(LIBS) + +sendcommand$(EXEEXT): utils/sendcommand.o utillib/ipc_c_tcp.o \ + utillib/citadel_ipc.o config.o $(LIBOBJS) + $(CC) utils/sendcommand.o utillib/ipc_c_tcp.o \ + utillib/citadel_ipc.o config.o utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS) + +getmail$(EXEEXT): utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + config.o $(LIBOBJS) + $(CC) utils/getmail.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + config.o utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o getmail$(EXEEXT) $(LIBS) + +base64$(EXEEXT): utils/base64.o + $(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT) + +userlist$(EXEEXT): utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/userlist.o utillib/ipc_c_tcp.o utillib/citadel_ipc.o \ + utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o userlist$(EXEEXT) $(LIBS) + +msgform$(EXEEXT): utils/msgform.o + $(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT) .PHONY: install-data install-doc install-exec clean cleaner distclean -install: install-exec install-data install-doc +install-locale: + cd po/citadel-setup; $(MAKE) + for i in `find locale -type d | grep -v .svn` \ + ; do \ + test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \ + done + for i in `find locale -type f | grep -v .svn`; do \ + $(INSTALL) $$i $(DESTDIR)$(LOCALEDIR)/$$i; \ + done + +install: install-exec install-data install-doc install-locale @echo @echo Installation is complete. @echo Now go to your Citadel directory and run 'setup'. @echo -install-new: install-exec-new install-data-new install-doc-new +install-new: install-exec-new install-data-new install-doc-new install-locale @echo @echo Installation is complete. @echo Now go to your Citadel directory and run 'setup'. @@ -207,7 +263,7 @@ install-data: network/systems; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done - @for i in citadel.rc public_clients \ + @for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients citadel_urlshorteners.rc \ `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ @@ -223,18 +279,19 @@ install-data-new: done $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/ $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients + $(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc $(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)/messages @for i in \ - `$(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 \ + @for i in funambol_newmail_soap.xml notify_about_newmail.js \ `find $(srcdir)/help -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \ @@ -341,10 +398,19 @@ install-exec-new: all done clean: + rm -fr locale/* rm -f *.o + rm -f utils/*.o ;\ + rm -f utillib/*.o ;\ + rm -f textclient/*.o ;\ for i in $(srcdir)/modules/* ; do \ rm -f $$i/*.o ;\ done + if test -d $(srcdir)/user_modules ; then \ + for i in $(srcdir)/user_modules/* ; do \ + rm -f $$i/*.o ;\ + done \ + fi rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) @@ -354,10 +420,19 @@ cleaner: clean distclean: cleaner find . -name '*~' -o -name '.#*' | xargs rm -f + rm -f po/Makefile rm -f Makefile sysdep.h config.cache config.log config.status *.d + rm -f utils/*.d ; + rm -f utillib/*.d ; + rm -f textclient/*.d ; for i in $(srcdir)/modules/* ; do \ rm -f $$i/*.d ;\ done + if test -d $(srcdir)/user_modules ; then \ + for i in $(srcdir)/user_modules/* ; do \ + rm -f $$i/*.o ;\ + done \ + fi .c.d: @echo Checking dependencies for $< @@ -376,4 +451,11 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4 cd $(srcdir) && $(ACLOCAL) +buildinfo: + echo + echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@" + echo "Complie: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ " + echo "LDFLAGS: $(LDFLAGS)" + echo + -include $(DEP_FILES)