-# Makefile for Citadel
+########################################################################
+#
+# Makefile for Citadel Server
#
# NOTE: normally you should not have to modify the Makefile. All
# system-dependent configuration is in the "configure" script, which
# uses "Makefile.in" to generate a "Makefile". In the rare instance
-# that you have to modify something here, please take note:
-# 1. Edit Makefile.in, -not- Makefile.
-# 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.
+# that you have to modify something here, please edit Makefile.in,
+# *not* Makefile.
#
########################################################################
EXEEXT=@EXEEXT@
-CLIENT_TARGETS=citadel$(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) \
+UTILBIN_TARGETS= setup$(EXEEXT) \
chkpw$(EXEEXT) chkpwd$(EXEEXT) \
- aidepost$(EXEEXT) msgform$(EXEEXT) \
ctdlmigrate$(EXEEXT)
-
ACLOCAL=@ACLOCAL@
AUTOCONF=@AUTOCONF@
chkpwd_LIBS=@chkpwd_LIBS@
CC=@CC@
-CFLAGS=@CFLAGS@ -I ./include/
-CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
+CFLAGS=@CFLAGS@ -I.
+CPPFLAGS=@CPPFLAGS@ -I.
DATABASE=@DATABASE@
DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
LDFLAGS=@LDFLAGS@
.SILENT:
-SOURCES=utils/aidepost.c utils/stress.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_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 \
+SOURCES=utils/citmail.c utils/setup.c utils/chkpw.c \
+ utils/sendcommand.c utils/ctdlmigrate.c utils/chkpwd.c \
+ 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 \
- 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 event_client.c
-
+ context.c netconfig.c
include Make_sources
@for d in `/bin/ls $(VPATH)/user_modules/`; do \
(mkdir -p user_modules/$$d ) ; \
done
- mkdir -p utils utillib textclient
+ mkdir -p utils
mkdir locale
svn_revision.c: ${SOURCES}
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 $@
-#
-#
-
parsedate.o: parsedate.c
Make_sources: modules_init.c
modules_upgrade.c: modules_init.c
-SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
+SERV_OBJS = server_main.o citadel_dirs.o \
user_ops.o citserver.o sysdep.o serv_extensions.o \
$(DATABASE:.c=.o) domain.o \
control.o config.o support.o room_ops.o \
- file_ops.o msgbase.o euidindex.o \
- locate_host.o housekeeping.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 \
+ parsedate.o genstamp.o threads.o context.o \
clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
- svn_revision.o ldap.o
+ svn_revision.o ldap.o netconfig.o
citserver$(EXEEXT): $(SERV_OBJS)
$(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
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 \
+citmail$(EXEEXT): utils/citmail.o citadel_dirs.o
+ $(CC) utils/citmail.o 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): utils/setup.o utillib/citadel_dirs.o
- $(CC) utils/setup.o utillib/citadel_dirs.o \
+setup$(EXEEXT): utils/setup.o citadel_dirs.o
+ $(CC) utils/setup.o 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 \
+ctdlmigrate$(EXEEXT): utils/ctdlmigrate.o citadel_dirs.o
+ $(CC) utils/ctdlmigrate.o 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 \
+chkpw$(EXEEXT): utils/chkpw.o auth.o citadel_dirs.o
+ $(CC) utils/chkpw.o auth.o citadel_dirs.o \
$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_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/citadel_dirs.o $(LIBOBJS)
- $(CC) utils/sendcommand.o utillib/citadel_dirs.o \
+sendcommand$(EXEEXT): utils/sendcommand.o citadel_dirs.o $(LIBOBJS)
+ $(CC) utils/sendcommand.o citadel_dirs.o \
$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
-base64$(EXEEXT): utils/base64.o
- $(CC) utils/base64.o $(LDFLAGS) -o base64$(EXEEXT)
-
-msgform$(EXEEXT): utils/msgform.o
- $(CC) utils/msgform.o $(LDFLAGS) -o msgform$(EXEEXT)
-
.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; \
@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 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; \
- done
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
-@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
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)/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 \
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
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
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; \
$(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 ; do \
if test -f $(srcdir)/$$i; then \
echo $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$i; \
$(INSTALL) $(srcdir)/$$i $(DESTDIR)$(prefix)/$$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; \
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; \
done
clean:
- rm -fr locale/*
- 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 *.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 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 ;
+ 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 ;
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
buildinfo:
echo
echo "Dependencies: $(CC) $(DEPEND_FLAG) $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@"
- echo "Complie: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
+ echo "Compile: $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@ "
echo "LDFLAGS: $(LDFLAGS)"
echo
projects / citadel.git / blobdiff