X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=9ec7b4f42751e8727dc31dd84ea2c6465af7e7b1;hb=a7d7e3f128e15f282f2a96aba513823aa9603c22;hp=cb952e569a6a3f91a7fc104db1c11d6b99ee041c;hpb=1421d26887f154439d2cd27075c7e85dc22f644f;p=citadel.git diff --git a/citadel/Makefile.in b/citadel/Makefile.in index cb952e569..9ec7b4f42 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -8,8 +8,6 @@ # 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@ @@ -26,37 +24,32 @@ 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 EXEEXT=@EXEEXT@ -CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) -NOINST_TARGETS=stress$(EXEEXT) SERVER_TARGETS=citserver$(EXEEXT) -SERV_MODULES= md5.o \ - ical_dezonify.o include Make_modules UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT) UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \ - chkpw$(EXEEXT) chkpwd$(EXEEXT) userlist$(EXEEXT) \ - getmail$(EXEEXT) aidepost$(EXEEXT) msgform$(EXEEXT) \ + chkpw$(EXEEXT) chkpwd$(EXEEXT) \ + msgform$(EXEEXT) \ ctdlmigrate$(EXEEXT) 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@ @@ -68,26 +61,27 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@ SERVER_LIBS=@SERVER_LIBS@ SETUP_LIBS=@SETUP_LIBS@ YACC=@YACC@ +DIFF=@DIFF@ +PATCH=@PATCH@ +LOCALEDIR=@LOCALEDIR@ # End configuration section +.SILENT: + -SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \ +SOURCES=utils/citmail.c \ utils/setup.c utils/msgform.c utils/chkpw.c \ - utils/sendcommand.c utils/getmail.c utils/userlist.c \ + utils/sendcommand.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 \ + utillib/citadel_dirs.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 \ - locate_host.c md5.c auth.c msgbase.c parsedate.c policy.c \ - room_ops.c euidindex.c server_main.c snprintf.c ldap.c \ + domain.c serv_extensions.c genstamp.c \ + housekeeping.c default_timezone.c internet_addressing.c \ + locate_host.c auth.c msgbase.c parsedate.c \ + room_ops.c euidindex.c server_main.c ldap.c \ support.c sysdep.c user_ops.c journaling.c threads.c \ - context.c + context.c netconfig.c md5.c include Make_sources @@ -104,34 +98,20 @@ mkdir-init: @for d in `/bin/ls $(VPATH)/user_modules/`; do \ (mkdir -p user_modules/$$d ) ; \ done - mkdir -p utils utillib textclient + mkdir -p utils utillib + mkdir locale svn_revision.c: ${SOURCES} - ./scripts/mk_svn_revision.sh + $(srcdir)/scripts/mk_svn_revision.sh DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d noinst: $(NOINST_TARGETS) -client: $(CLIENT_TARGETS) server: $(SERVER_TARGETS) $(SERV_MODULES) utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS) -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) $< mv -f y.tab.c $@ @@ -147,27 +127,24 @@ Make_modules: modules_init.c modules_upgrade.c: modules_init.c -SERV_OBJS = server_main.o utillib/citadel_dirs.o\ +SERV_OBJS = server_main.o utillib/citadel_dirs.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 \ - file_ops.o msgbase.o euidindex.o \ - locate_host.o housekeeping.o \ + control.o config.o support.o room_ops.o \ + msgbase.o euidindex.o \ + locate_host.o housekeeping.o default_timezone.o \ internet_addressing.o journaling.o \ - parsedate.o genstamp.o ecrash.o threads.o context.o \ - clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \ - svn_revision.o ldap.o + parsedate.o genstamp.o threads.o context.o \ + clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \ + svn_revision.o ldap.o netconfig.o md5.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): utils/aidepost.o config.o - $(CC) utils/aidepost.o config.o utillib/citadel_dirs.o \ - $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) - citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o $(CC) utils/citmail.o utillib/citadel_dirs.o \ $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS) @@ -188,51 +165,36 @@ 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 \ +sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/sendcommand.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'. @@ -245,12 +207,9 @@ upgrade: install-exec install-doc @echo install-data: - @for i in help messages network/spoolin network/spoolout \ - network/systems; do \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ - done - @for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients \ - `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ + $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages + @for i in public_clients citadel_urlshorteners.rc \ + `find $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ done @@ -260,13 +219,10 @@ install-data: fi install-data-new: - @for i in network/spoolin network/spoolout network/systems; do \ - $(srcdir)/mkinstalldirs $(DESTDIR)$(RUN_DIR)/$$i; \ - done $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/ $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients - $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc - $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$ + $(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc + $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages @for i in \ @@ -274,21 +230,11 @@ install-data-new: 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 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; \ - done - $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin - $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout - $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/systems -@if test -d $(DESTDIR)/etc/pam.d; then \ echo $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ $(INSTALL_DATA) $(srcdir)/citadel.pam $(DESTDIR)/etc/pam.d/citadel; \ fi - @for i in bio bitbucket files images info userpics; do \ + @for i in files; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \ done @@ -298,15 +244,6 @@ install-doc: echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ done - @$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/techdoc - @for i in `find $(srcdir)/techdoc -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ - done - @for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \ - $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(prefix)/$$i; \ - done echo $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt $(INSTALL_DATA) README.txt $(DESTDIR)$(prefix)/README.txt @@ -321,17 +258,13 @@ install-doc-new: echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ done - @for i in `cd openldap; find $(srcdir)/ -type f | grep -v .svn`; do \ - echo $(INSTALL_DATA) $$i $(DESTDIR)$(DOC_DIR)/$$i; \ - $(INSTALL_DATA) openldap/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ - done $(INSTALL_DATA) README.txt $(DESTDIR)$(DOC_DIR)/README.txt install-exec: all - @for i in bio bitbucket files images info userpics; do \ + @for i in files; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done - @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \ + @for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \ if test -f $$i; then \ echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \ @@ -340,7 +273,7 @@ install-exec: all $(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 \ + @for i in utilsmenu database_cleanup.sh migrate_aliases.sh; do \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \ @@ -369,13 +302,7 @@ install-exec-new: all done $(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail; - @for i in $(CLIENT_TARGETS); do \ - if test -f $$i; then \ - echo $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \ - $(INSTALL) $$i $(DESTDIR)/usr/bin/$$i; \ - fi \ - done - @for i in utilsmenu database_cleanup.sh citadel-openldap.schema ; do \ + @for i in utilsmenu database_cleanup.sh; do \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ @@ -383,37 +310,37 @@ install-exec-new: all done clean: - rm -f *.o - rm -f utils/*.o ;\ - rm -f utillib/*.o ;\ - rm -f textclient/*.o ;\ + rm -vfr locale/* + rm -vf *.o + rm -vf utils/*.o ;\ + rm -vf utillib/*.o ;\ for i in $(srcdir)/modules/* ; do \ - rm -f $$i/*.o ;\ + rm -vf $$i/*.o ;\ done if test -d $(srcdir)/user_modules ; then \ for i in $(srcdir)/user_modules/* ; do \ - rm -f $$i/*.o ;\ + rm -vf $$i/*.o ;\ done \ fi - rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) + rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) cleaner: clean - rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la - rm -rf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources + rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la + rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources distclean: cleaner - find . -name '*~' -o -name '.#*' | xargs rm -f - rm -f Makefile sysdep.h config.cache config.log config.status *.d - rm -f utils/*.d ; - rm -f utillib/*.d ; - rm -f textclient/*.d ; + find . -name '*~' -o -name '.#*' | xargs rm -vf + rm -vf po/Makefile + rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d package-version.txt + rm -vf utils/*.d ; + rm -vf utillib/*.d ; for i in $(srcdir)/modules/* ; do \ - rm -f $$i/*.d ;\ + rm -vf $$i/*.d ;\ done if test -d $(srcdir)/user_modules ; then \ for i in $(srcdir)/user_modules/* ; do \ - rm -f $$i/*.o ;\ + rm -vf $$i/*.o ;\ done \ fi @@ -434,4 +361,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 "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ " + echo "LDFLAGS: $(LDFLAGS)" + echo + -include $(DEP_FILES)