########################################################################
TARGETS=@TARGETS@
-CHKPWD=@CHKPWD@
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@
DOC_DIR=@MAKE_DOC_DIR@
+UTILBIN_DIR=@MAKE_UTILBIN_DIR@
+DEPEND_FLAG=@DEPEND_FLAG@
all: $(TARGETS)
.SUFFIXES: .o .d .c
EXEEXT=@EXEEXT@
CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT) stress$(EXEEXT)
-SERVER_TARGETS=citserver setup $(CHKPWD)
-SERV_MODULES=serv_chat.o \
- serv_upgrade.o \
- serv_smtp.o \
- serv_spam.o \
- serv_pop3.o \
- serv_vcard.o vcard.o \
- serv_mrtg.o \
- serv_imap.o imap_fetch.o imap_misc.o imap_search.o \
- imap_store.o imap_acl.o imap_tools.o \
- serv_fulltext.o ft_wordbreaker.o crc16.o \
- serv_network.o \
- serv_listsub.o \
- serv_netfilter.o \
- serv_newuser.o \
- serv_notes.o \
- serv_pas2.o md5.o \
- serv_inetcfg.o \
- serv_rwho.o \
- serv_bio.o \
- serv_expire.o \
- serv_vandelay.o \
- serv_calendar.o \
- serv_sieve.o \
- serv_managesieve.o \
+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 \
- serv_ldap.o \
- serv_autocompletion.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 \
- base64
+
+UTILBIN_TARGETS= base64 setup chkpw chkpwd
prefix=@prefix@
srcdir=@srcdir@
AUTOCONF=@AUTOCONF@
chkpwd_LIBS=@chkpwd_LIBS@
CC=@CC@
-CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I.
+CFLAGS=@CFLAGS@ -I ./include/
+CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
DATABASE=@DATABASE@
DEFS=@DEFS@
LDFLAGS=@LDFLAGS@
VPATH=$(srcdir)
-SOURCES=aidepost.c auth.c base64.c chkpwd.c citadel.c citadel_ipc.c \
+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 imap_fetch.c imap_misc.c \
- imap_search.c imap_store.c imap_tools.c internet_addressing.c \
- ipc_c_tcp.c locate_host.c md5.c messages.c serv_autocompletion.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 serv_bio.c serv_calendar.c serv_chat.c \
- serv_crypto.c serv_expire.c serv_imap.c serv_inetcfg.c \
- serv_listsub.c serv_mrtg.c serv_netfilter.c serv_network.c \
- serv_newuser.c serv_pas2.c serv_pop3.c serv_rwho.c serv_smtp.c \
- serv_spam.c serv_test.c serv_mrtg.c serv_spam.c serv_upgrade.c \
- serv_vandelay.c serv_vcard.c serv_managesieve.c server_main.c \
- serv_sieve.c setup.c snprintf.c imap_acl.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 serv_notes.c serv_fulltext.c ft_wordbreaker.c \
- crc16.c journaling.c citadel_dirs.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)
+DEP_FILES=$(SOURCES:.c=.d) modules_init.d
client: $(CLIENT_TARGETS)
server: $(SERVER_TARGETS) $(SERV_MODULES)
-utils: $(UTIL_TARGETS)
+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 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 $(LIBOBJS) \
+ routines2.o screen.o tools.o citadel_dirs.o ecrash.o $(LIBOBJS) \
$(LDFLAGS) -o citadel $(LIBS)
.y.c:
parsedate.o: parsedate.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 \
file_ops.o msgbase.o euidindex.o \
locate_host.o housekeeping.o mime_parser.o html.o \
internet_addressing.o journaling.o \
- serv_crypto.o parsedate.o genstamp.o \
- clientsocket.o $(AUTH) $(SERV_MODULES)
+ parsedate.o genstamp.o ecrash.o \
+ clientsocket.o modules_init.o $(AUTH) $(SERV_MODULES)
citserver: $(SERV_OBJS)
$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver
aidepost: aidepost.o config.o
$(CC) aidepost.o config.o citadel_dirs.o $(LDFLAGS) -o aidepost $(LIBS)
-citmail: citmail.o config.o citadel_dirs.o
- $(CC) citmail.o config.o citadel_dirs.o $(LDFLAGS) -o citmail $(LIBS)
+citmail: citmail.o citadel_dirs.o tools.o
+ $(CC) citmail.o citadel_dirs.o tools.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)
-chkpwd: chkpwd.o auth.o config.o citadel_dirs.o
- $(CC) chkpwd.o auth.o config.o citadel_dirs.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
- chmod 4755 chkpwd
+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)
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)
$(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
- $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/help
- $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/messages
+ $(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 \
- echo $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
- $(INSTALL_DATA) $$i $(DESTDIR)$(ETC_DIR)/$$i; \
+ echo $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
done
$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
$(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
@for i in bio bitbucket files images info userpics; do \
$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
done
- @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS); do \
+ @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS); do \
if test -f $$i; then \
echo $(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
$(INSTALL) $$i $(DESTDIR)$(prefix)/$$i; \
$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
fi \
done
- @if test x`find $(DESTDIR)$(prefix)/chkpwd -user root` = x$(DESTDIR)$(prefix)/chkpwd; then \
- echo chmod u+s $(DESTDIR)$(prefix)/chkpwd; \
- chmod u+s $(DESTDIR)$(prefix)/chkpwd; \
- fi
install-exec-new: all
$(srcdir)/mkinstalldirs $(DESTDIR)/usr/sbin;
$(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin;
- $(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR);
+ $(srcdir)/mkinstalldirs $(DESTDIR)/usr/bin;
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(UTILBIN_DIR);
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(DOC_DIR);
@for i in $(SERVER_TARGETS) $(UTIL_TARGETS); do \
if test -f $$i; then \
echo $(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \
$(INSTALL) $$i $(DESTDIR)/usr/sbin/$$i; \
fi \
done
+ @for i in $(UTILBIN_TARGETS); do \
+ if test -f $$i; then \
+ echo $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
+ $(INSTALL) $$i $(DESTDIR)/$(UTILBIN_DIR)/$$i; \
+ fi \
+ done
$(INSTALL) citmail $(DESTDIR)/usr/sbin/sendmail;
@for i in $(CLIENT_TARGETS); do \
$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(DOC_DIR)/$$i; \
fi \
done
- @if test x`find $(DESTDIR)/usr/sbin/chkpwd -user root` = x$(DESTDIR)$(prefix)/chkpwd; then \
- echo chmod u+s $(DESTDIR)/usr/sbin/chkpwd; \
- chmod u+s $(DESTDIR)usr/sbin/chkpwd; \
- fi
clean:
- rm -f *.o
+ rm -f *.o
+ for i in $(srcdir)/modules/* ; do \
+ rm -f $$i/*.o ;\
+ done
+ rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS)
+
cleaner: clean
- rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) *.la
+ rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) database_cleanup.sh *.la
+ rm -rf modules_init.c modules_init.h
distclean: cleaner
find . -name '*~' -o -name '.#*' | xargs rm -f
- rm -f Makefile sysdep.h config.cache config/.og config.status *.d
+ rm -f Makefile sysdep.h config.cache config.log config.status *.d
+ for i in $(srcdir)/modules/* ; do \
+ rm -f $$i/*.d ;\
+ done
.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
projects / citadel.git / blobdiff