X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=34458a61cbe045570d9d49fabb0d78f204bc51cc;hb=6cd4b62a62098566ed73d7662d22e29fc509b9f3;hp=77390db2a11d0d2fe2acaa04a3f9829ef01a5cff;hpb=f1275c774787228d3f967eadb7cf0bdd4657e232;p=citadel.git diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 77390db2a..34458a61c 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -8,86 +8,49 @@ # 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@ 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@ -all: $(TARGETS) +DEPEND_FLAG=@DEPEND_FLAG@ +all: buildinfo $(TARGETS) .SUFFIXES: .o .d .c 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 \ - 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 - -UTIL_TARGETS=aidepost msgform \ - citmail userlist sendcommand \ - -UTILBIN_TARGETS= base64 setup chkpw chkpwd +SERVER_TARGETS=citserver$(EXEEXT) + +include Make_modules + +UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT) + +UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \ + chkpw$(EXEEXT) chkpwd$(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@ -LDFLAGS=@LDFLAGS@ -rdynamic +DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\" +LDFLAGS=@LDFLAGS@ LIBS=@LIBS@ LIBOBJS=@LIBOBJS@ INSTALL=@INSTALL@ @@ -98,80 +61,57 @@ 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=utils/aidepost.c utils/citmail.c \ + utils/setup.c utils/msgform.c utils/chkpw.c \ + utils/sendcommand.c \ + utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \ + utillib/citadel_dirs.c \ + citserver.c clientsocket.c config.c control.c $(DATABASE) \ + domain.c serv_extensions.c genstamp.c \ + housekeeping.c ical_dezonify.c internet_addressing.c ecrash.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 netconfig.c nttlist.c md5.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 + mkdir locale + +svn_revision.c: ${SOURCES} + $(srcdir)/scripts/mk_svn_revision.sh + +DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d -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) \ - domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \ - housekeeping.c html.c ical_dezonify.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 \ - 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 - -DEP_FILES=$(SOURCES:.c=.d) modules_init.d - -client: $(CLIENT_TARGETS) +noinst: $(NOINST_TARGETS) 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 html.o ipc_c_tcp.o md5.o messages.o rooms.o routines.o \ - routines2.o screen.o tools.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 ecrash.o $(LIBOBJS) \ - $(LDFLAGS) -o citadel $(LIBS) - .y.c: $(YACC) $(YFLAGS) $< mv -f y.tab.c $@ @@ -181,70 +121,83 @@ 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 -SERV_OBJS = server_main.o \ +SERV_OBJS = server_main.o utillib/citadel_dirs.o \ user_ops.o citserver.o sysdep.o serv_extensions.o \ - tools.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 \ + $(DATABASE:.c=.o) domain.o \ + control.o config.o support.o room_ops.o \ + msgbase.o euidindex.o \ + locate_host.o housekeeping.o ical_dezonify.o \ internet_addressing.o journaling.o \ - parsedate.o genstamp.o ecrash.o \ - clientsocket.o modules_init.o $(AUTH) $(SERV_MODULES) + 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 netconfig.o nttlist.o md5.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: +%.o: %.c ${HEADERS} + echo "CC $<" $(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): utils/aidepost.o utillib/citadel_dirs.o + $(CC) utils/aidepost.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o aidepost$(EXEEXT) $(LIBS) -citmail: citmail.o citadel_dirs.o tools.o - $(CC) citmail.o citadel_dirs.o tools.o $(LDFLAGS) -o citmail $(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: setup.o tools.o citadel_dirs.o - $(CC) setup.o tools.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) - -chkpw: chkpw.o auth.o citadel_dirs.o - $(CC) chkpw.o auth.o citadel_dirs.o $(LDFLAGS) -o chkpw $(chkpwd_LIBS) +setup$(EXEEXT): utils/setup.o utillib/citadel_dirs.o + $(CC) utils/setup.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o setup$(EXEEXT) $(LIBS) $(SETUP_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) +ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o utillib/citadel_dirs.o + $(CC) utils/ctdlmigrate.o utillib/citadel_dirs.o \ + $(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(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) +chkpwd$(EXEEXT): utils/chkpwd.o auth.o + $(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_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 \ - citadel_dirs.o $(LIBOBJS) $(LDFLAGS) -o sendcommand $(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) -base64: base64.o - $(CC) base64.o $(LDFLAGS) -o base64 +sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS) + $(CC) utils/sendcommand.o utillib/citadel_dirs.o \ + $(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS) -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 \ - $(LIBOBJS) $(LDFLAGS) -o userlist $(LIBS) +base64$(EXEEXT): utils/base64.o + $(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT) -msgform: msgform.o - $(CC) msgform.o $(LDFLAGS) -o msgform +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'. @@ -261,7 +214,7 @@ install-data: network/systems; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done - @for i in citadel.rc public_clients \ + @for i in notify_about_newmail.js 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; \ @@ -277,16 +230,22 @@ install-data-new: 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)/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)/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 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 @@ -294,7 +253,7 @@ install-data-new: 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 bio files images info userpics; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \ done @@ -309,6 +268,10 @@ install-doc: 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 @@ -323,19 +286,26 @@ 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 bio files images info userpics; 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; \ 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 +324,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; \ @@ -362,12 +334,6 @@ 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 \ if test -f $(srcdir)/$$i; then \ echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \ @@ -376,27 +342,43 @@ install-exec-new: all done clean: - rm -f *.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 - rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) + if test -d $(srcdir)/user_modules ; then \ + for i in $(srcdir)/user_modules/* ; do \ + rm -vf $$i/*.o ;\ + done \ + fi + rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) 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 -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 + find . -name '*~' -o -name '.#*' | xargs rm -vf + rm -vf po/Makefile + rm -vf Makefile configure sysdep.h config.cache config.log config.status *.d + 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 -vf $$i/*.o ;\ + done \ + fi .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 @@ -411,4 +393,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)