X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=ccbf0d2acb2a4302434b9b54e9c08cdc452e2be4;hb=82adc0fcf4da8e91ec4ff11f1a0f9d96449f85ad;hp=0c7857a848578436403b26d1108e5ddd1455ac08;hpb=d34bd7a40dcd1f037c186a3d51f30b32ec08bed8;p=citadel.git diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 0c7857a84..ccbf0d2ac 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -38,7 +38,7 @@ UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT) UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \ chkpw$(EXEEXT) chkpwd$(EXEEXT) \ - aidepost$(EXEEXT) msgform$(EXEEXT) \ + msgform$(EXEEXT) \ ctdlmigrate$(EXEEXT) @@ -70,7 +70,7 @@ LOCALEDIR=@LOCALEDIR@ .SILENT: -SOURCES=utils/aidepost.c utils/citmail.c \ +SOURCES=utils/citmail.c \ utils/setup.c utils/msgform.c utils/chkpw.c \ utils/sendcommand.c \ utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \ @@ -81,7 +81,7 @@ SOURCES=utils/aidepost.c utils/citmail.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 + context.c netconfig.c md5.c include Make_sources @@ -136,7 +136,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \ internet_addressing.o journaling.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 netconfig.o nttlist.o md5.o + 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) @@ -145,10 +145,6 @@ citserver$(EXEEXT): $(SERV_OBJS) echo "CC $<" $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ -aidepost$(EXEEXT): utils/aidepost.o utillib/citadel_dirs.o - $(CC) utils/aidepost.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) @@ -182,7 +178,8 @@ msgform$(EXEEXT): utils/msgform.o .PHONY: install-data install-doc install-exec clean cleaner distclean install-locale: - cd po/citadel-setup; $(MAKE) + 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; \ @@ -210,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 public_clients citadel_urlshorteners.rc \ - `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 @@ -225,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_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc - $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$ + $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages @for i in \ @@ -239,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 netconfigs; do \ + @for i in files; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(DATA_DIR)/$$i; \ done @@ -263,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 @@ -286,14 +258,10 @@ 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 netconfigs; do \ + @for i in files; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done @for i in $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \ @@ -305,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; \ @@ -334,7 +302,7 @@ install-exec-new: all done $(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail; - @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; \ @@ -364,7 +332,7 @@ cleaner: clean distclean: cleaner 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 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 \