all: $(TARGETS)
-.SUFFIXES: .ro .mo .d .c
+.SUFFIXES: .lo .ro .d .c
EXEEXT=@EXEEXT@
-SO=@SO@
CX=@CX@
+SMTP=@SMTP@
+
CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
-SERVER_TARGETS=citserver setup $(CHKPWD)
-SERV_MODULES=modules/serv_chat$(SO) modules/serv_vcard$(SO) \
- modules/serv_upgrade$(SO) \
- modules/serv_smtp$(SO) \
- modules/serv_pop3$(SO) \
- modules/serv_imap$(SO) \
- modules/serv_network$(SO) \
- modules/serv_pas2$(SO) \
- modules/serv_inetcfg$(SO) \
- modules/serv_rwho$(SO) \
- modules/serv_moderate$(SO) \
- modules/serv_bio$(SO) \
- modules/serv_expire$(SO) \
- modules/serv_vandelay$(SO) \
- modules/serv_ical$(SO)
+SERVER_TARGETS=libcitserver.la citserver setup $(CHKPWD)
+SERV_MODULES=modules/libchat.la modules/libvcard.la \
+ modules/libupgrade.la \
+ $(SMTP) \
+ modules/libpop3.la \
+ modules/libimap.la \
+ modules/libnetwork.la \
+ modules/libpas2.la \
+ modules/libinetcfg.la \
+ modules/librwho.la \
+ modules/libmoderate.la \
+ modules/libbio.la \
+ modules/libexpire.la \
+ modules/libvandelay.la \
+ modules/libical.la
UTIL_TARGETS=aidepost netmailer netproc netsetup msgform readlog rcit \
- stats citmail netpoll mailinglist userlist sendcommand \
+ stats citmail mailinglist userlist sendcommand \
base64 qpdecode
prefix=@prefix@
CC=@CC@
GDBM=@GDBM@
RESOLV=@RESOLV@
-LINK_SHARED=@LINK_SHARED@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
-SERVER_LDFLAGS=@SERVER_LDFLAGS@
-PICFLAGS=@PICFLAGS@
CURSES=@CURSES@
NETLIBS=@NETLIBS@
chkpwd_LIBS=@chkpwd_LIBS@
YACC=@YACC@
DATABASE=@DATABASE@
+LIBTOOL=./libtool
+LTSHARE=cd modules && ../$(LIBTOOL) $(CC) -rpath $(prefix)/modules -no-undefined -avoid-version -module
+
# End configuration section
VPATH=$(srcdir)
+DOMAIN=@DOMAIN@
+
SOURCES=aidepost.c citadel.c citmail.c citserver.c client_chat.c commands.c \
config.c control.c $(DATABASE) dynloader.c file_ops.c \
housekeeping.c internetmail.c ipc_c_tcp.c locate_host.c \
logging.c mailinglist.c messages.c msgbase.c msgform.c netmailer.c \
- netpoll.c netproc.c netsetup.c policy.c rcit.c readlog.c \
+ netproc.c netsetup.c policy.c rcit.c readlog.c \
room_ops.c rooms.c routines.c routines2.c serv_chat.c \
serv_info.c serv_test.c setup.c snprintf.c stats.c serv_vcard.c \
support.c sysdep.c tools.c user_ops.c userlist.c serv_expire.c \
whobbs.c sendcommand.c mime_parser.c base64.c qpdecode.c getutline.c \
auth.c chkpwd.c html.c vcard.c serv_upgrade.c serv_vandelay.c \
serv_smtp.c serv_pop3.c internet_addressing.c parsedate.c genstamp.c \
- domain.c clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
- serv_moderate.c client_passwords.c \
+ $(DOMAIN) clientsocket.c serv_inetcfg.c serv_rwho.c serv_bio.c \
+ serv_moderate.c client_passwords.c imap_misc.c \
serv_imap.c imap_tools.c imap_fetch.c imap_search.c imap_store.c \
- serv_network.c serv_pas2.c serv_ical.c md5.c
+ serv_network.c serv_pas2.c serv_ical.c md5.c server_main.c
DEP_FILES=$(SOURCES:.c=.d)
utils: $(UTIL_TARGETS)
serv_modules: $(SERV_MODULES)
+ @cd modules && mods=`echo .libs/*.s[ol]` && test "$$mods" != '.libs/*.s[ol]' && ln -sf $$mods . || true
+ @cd modules && mods=`echo .libs/*.dll` && test "$$mods" != '.libs/*.dll' && ln -sf $$mods . || true
#
#
client_passwords$(CX) md5$(CX) \
$(LIBOBJS) $(LDFLAGS) -o citadel $(NETLIBS) $(CLIENT_PTLIBS)
-netpoll: netpoll.o config.o ipc_c_tcp.o tools.o $(LIBOBJS)
- $(CC) netpoll.o config.o ipc_c_tcp.o tools.o \
- $(LIBOBJS) $(LDFLAGS) -o netpoll $(NETLIBS)
-
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
#
#
-SERV_OBJS = citserver.ro user_ops.ro support.ro room_ops.ro file_ops.ro \
- msgbase.ro config.ro sysdep.ro locate_host.ro housekeeping.ro \
- $(DATABASE:.c=.ro) control.ro logging.ro policy.ro dynloader.ro tools.ro \
- mime_parser.ro html.ro internet_addressing.ro \
- parsedate.ro genstamp.ro clientsocket.ro \
- $(AUTH) $(LIBOBJS:.o=.ro)
+SERV_OBJS = server_main.ro
parsedate.ro: parsedate.c
-citserver: $(SERV_OBJS)
- $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(PTHREAD_LIBS) \
- $(LIBS) $(NETLIBS) $(GDBM) $(RESOLV) -o citserver
+LIBSERV_OBJS = user_ops.lo citserver.lo sysdep.lo dynloader.lo tools.lo $(DATABASE:.c=.lo) \
+ control.lo policy.lo config.lo support.lo room_ops.lo file_ops.lo msgbase.lo \
+ locate_host.lo housekeeping.lo logging.lo mime_parser.lo html.lo internet_addressing.lo \
+ parsedate.lo genstamp.lo clientsocket.lo $(AUTH) $(LIBOBJS:.o=.lo)
+
+libcitserver.la: $(LIBSERV_OBJS)
+ $(LIBTOOL) $(CC) $(LDFLAGS) -rpath $(prefix) -no-undefined -avoid-version \
+ -o libcitserver.la $(LIBSERV_OBJS) $(GDBM) $(LIBS) $(PTHREAD_LIBS) $(NETLIBS) $(RESOLV)
+
+citserver: $(SERV_OBJS) $(LIBTOOL) libcitserver.la
+ $(LIBTOOL) --mode=link $(CC) $(SERV_OBJS) $(LDFLAGS) libcitserver.la -o \
+ citserver $(PTHREAD_LIBS)
.c.ro:
$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
-.c.mo:
+.c.lo: $(LIBTOOL)
@test -d modules || mkdir -p modules
- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) $(PICFLAGS) -DPIC -c $< -o $@
-
-modules/serv_chat.so: serv_chat.mo
- $(LINK_SHARED) -o modules/serv_chat.so serv_chat.mo
-
-modules/serv_chat.mo: serv_chat.mo
- ln -f serv_chat.mo modules
-
-modules/serv_test.so: serv_test.mo
- $(LINK_SHARED) -o modules/serv_test.so serv_test.mo
-
-modules/serv_test.mo: serv_test.mo
- ln -f serv_test.mo modules
-
-modules/serv_pop3.so: serv_pop3.mo md5.mo
- $(LINK_SHARED) -o modules/serv_pop3.so serv_pop3.mo md5.mo
-
-modules/serv_pop3.mo: serv_pop3.mo
- ln -f serv_pop3.mo modules
-
-modules/serv_inetcfg.so: serv_inetcfg.mo
- $(LINK_SHARED) -o modules/serv_inetcfg.so serv_inetcfg.mo
-
-modules/serv_inetcfg.mo: serv_inetcfg.mo
- ln -f serv_inetcfg.mo modules
-
-modules/serv_rwho.so: serv_rwho.mo
- $(LINK_SHARED) -o modules/serv_rwho.so serv_rwho.mo
-
-modules/serv_rwho.mo: serv_rwho.mo
- ln -f serv_rwho.mo modules
-
-modules/serv_moderate.so: serv_moderate.mo
- $(LINK_SHARED) -o modules/serv_moderate.so serv_moderate.mo
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
-modules/serv_moderate.mo: serv_moderate.mo
- ln -f serv_moderate.mo modules
+modules/libchat.la: serv_chat.lo libcitserver.la $(LIBTOOL)
+ $(LTSHARE) -o libchat.la ../serv_chat.lo ../libcitserver.la
-modules/serv_bio.so: serv_bio.mo
- $(LINK_SHARED) -o modules/serv_bio.so serv_bio.mo
+modules/libtest.la: serv_test.lo libcitserver.la $(LIBTOOL)
+ $(LTSHARE) -o libtest.la ../serv_test.lo ../libcitserver.la
-modules/serv_bio.mo: serv_bio.mo
- ln -f serv_bio.mo modules
+modules/libpop3.la: serv_pop3.lo md5.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libpop3.la ../serv_pop3.lo ../md5.lo ../libcitserver.la
-modules/serv_expire.so: serv_expire.mo
- $(LINK_SHARED) -o modules/serv_expire.so serv_expire.mo
+modules/libinetcfg.la: serv_inetcfg.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libinetcfg.la ../serv_inetcfg.lo ../libcitserver.la
-modules/serv_expire.mo: serv_expire.mo
- ln -f serv_expire.mo modules
+modules/librwho.la: serv_rwho.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o librwho.la ../serv_rwho.lo ../libcitserver.la
-modules/serv_vandelay.so: serv_vandelay.mo
- $(LINK_SHARED) -o modules/serv_vandelay.so serv_vandelay.mo
+modules/libmoderate.la: serv_moderate.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libmoderate.la ../serv_moderate.lo ../libcitserver.la
-modules/serv_vandelay.mo: serv_vandelay.mo
- ln -f serv_vandelay.mo modules
+modules/libbio.la: serv_bio.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libbio.la ../serv_bio.lo ../libcitserver.la
-modules/serv_network.so: serv_network.mo
- $(LINK_SHARED) -o modules/serv_network.so serv_network.mo
+modules/libexpire.la: serv_expire.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libexpire.la ../serv_expire.lo ../libcitserver.la
-modules/serv_network.mo: serv_network.mo
- ln -f serv_network.mo modules
+modules/libvandelay.la: serv_vandelay.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libvandelay.la ../serv_vandelay.lo ../libcitserver.la
-modules/serv_upgrade.so: serv_upgrade.mo
- $(LINK_SHARED) -o modules/serv_upgrade.so serv_upgrade.mo
+modules/libnetwork.la: serv_network.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libnetwork.la ../serv_network.lo ../libcitserver.la
-modules/serv_upgrade.mo: serv_upgrade.mo
- ln -f serv_upgrade.mo modules
+modules/libupgrade.la: serv_upgrade.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libupgrade.la ../serv_upgrade.lo ../libcitserver.la
-modules/serv_vcard.so: serv_vcard.mo vcard.mo
- $(LINK_SHARED) -o modules/serv_vcard.so serv_vcard.mo vcard.mo
+modules/libvcard.la: serv_vcard.lo vcard.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libvcard.la ../serv_vcard.lo ../vcard.lo ../libcitserver.la
-modules/serv_vcard.mo: serv_vcard.mo
- ln -f serv_vcard.mo modules
+modules/libsmtp.la: serv_smtp.lo domain.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libsmtp.la ../serv_smtp.lo ../domain.lo ../libcitserver.la
-modules/vcard.mo: vcard.mo
- ln -f vcard.mo modules
-modules/serv_smtp.so: serv_smtp.mo domain.mo
- $(LINK_SHARED) -o modules/serv_smtp.so serv_smtp.mo domain.mo
+modules/libimap.la: serv_imap.lo imap_tools.lo imap_fetch.lo \
+ imap_search.lo imap_store.lo imap_misc.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libimap.la ../imap_tools.lo ../serv_imap.lo \
+ ../imap_fetch.lo ../imap_search.lo ../imap_store.lo ../imap_misc.lo ../libcitserver.la
-modules/serv_smtp.mo: serv_smtp.mo
- ln -f serv_smtp.mo modules
+aidepost: aidepost.o libcitserver.la $(LIBOBJS)
+ $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost
-modules/domain.mo: domain.mo
- ln -f domain.mo modules
+modules/libpas2.la: serv_pas2.lo md5.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libpas2.la ../serv_pas2.lo ../md5.lo ../libcitserver.la
-modules/serv_imap.so: serv_imap.mo imap_tools.mo imap_fetch.mo \
- imap_search.mo imap_store.mo
- $(LINK_SHARED) -o modules/serv_imap.so imap_tools.mo serv_imap.mo \
- imap_fetch.mo imap_search.mo imap_store.mo
-
-modules/serv_imap.mo: serv_imap.mo
- ln -f serv_imap.mo modules
-
-modules/imap_tools.mo: imap_tools.mo
- ln -f imap_tools.mo modules
-
-modules/imap_fetch.mo: imap_fetch.mo
- ln -f imap_fetch.mo modules
-
-modules/imap_search.mo: imap_search.mo
- ln -f imap_search.mo modules
-
-modules/imap_store.mo: imap_store.mo
- ln -f imap_store.mo modules
-
-aidepost: aidepost.o config.o $(LIBOBJS)
- $(CC) aidepost.o config.o $(LIBOBJS) $(LDFLAGS) -o aidepost
-
-modules/serv_pas2.so: serv_pas2.mo md5.mo
- $(LINK_SHARED) -o modules/serv_pas2.so serv_pas2.mo md5.mo
-
-modules/serv_pas2.mo: serv_pas2.mo
- ln -f serv_pas2.mo modules
-
-modules/md5.mo: md5.mo
- ln -f md5.mo modules
-
-modules/serv_ical.so: serv_ical.mo
- $(LINK_SHARED) -o modules/serv_ical.so serv_ical.mo
-
-modules/serv_ical.mo: serv_ical.mo
- ln -f serv_ical.mo modules
+modules/libical.la: serv_ical.lo $(LIBTOOL) libcitserver.la
+ $(LTSHARE) -o libical.la ../serv_ical.lo ../libcitserver.la
whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS)
$(CC) whobbs.o ipc_c_tcp.o tools.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(NETLIBS)
-sendcommand: sendcommand.o ipc_c_tcp.o tools.o config.o $(LIBOBJS)
- $(CC) sendcommand.o ipc_c_tcp.o tools.o config.o \
+sendcommand: sendcommand.o ipc_c_tcp.o libcitserver.la $(LIBOBJS)
+ $(LIBTOOL) $(CC) sendcommand.o ipc_c_tcp.o libcitserver.la \
$(LIBOBJS) $(LDFLAGS) -o sendcommand $(NETLIBS)
qpdecode: qpdecode.o
rcit: rcit.o config.o
$(CC) rcit.o config.o $(LDFLAGS) -o rcit
-stats: stats.o ipc_c_tcp.o tools.o config.o $(LIBOBJS)
- $(CC) stats.o ipc_c_tcp.o tools.o config.o $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS)
+stats: stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS)
+ $(LIBTOOL) $(CC) stats.o ipc_c_tcp.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o stats $(NETLIBS)
.PHONY: install-data install-doc install-exec clean cleaner distclean
@for i in bio bitbucket files images info modules userpics; do \
$(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
done
- @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
- $(SERV_MODULES) ; do \
+ @for i in $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS); do \
+ if test -f $$i; then \
+ echo $(LIBTOOL) --mode=install $(INSTALL) $$i $(root)$(prefix)/$$i; \
+ $(LIBTOOL) --mode=install $(INSTALL) $$i $(root)$(prefix)/$$i; \
+ fi \
+ done
+ @for i in $(SERV_MODULES) ; do \
if test -f $$i; then \
- echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
- $(INSTALL) $$i $(root)$(prefix)/$$i; \
+ (cd modules && ../$(LIBTOOL) --mode=install $(INSTALL) `basename $$i` $(root)$(prefix)/$$i) ; \
fi \
done
@for i in utilsmenu weekly dnetsetup; do \
fi
clean:
- rm -f *.o *.ro *.mo parsedate.c
+ rm -f *.o *.ro *.lo parsedate.c
cleaner: clean
- rm -f $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
- modules/*.[ms]o so_locations
+ rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
+ modules/*.la modules/.libs so_locations
distclean: cleaner
find . -name '*~' -o -name '.#*' | xargs rm -f
.c.d:
@echo Checking dependencies for $<
- @$(CC) -M $(CPPFLAGS) $(PTHREAD_DEFS) $< | sed -e 's!$*.o!$*.o $*.ro $*.mo $@!' > $@
+ @$(CC) -M $(CPPFLAGS) $(PTHREAD_DEFS) $< | sed -e 's!$*.o!$*.o $*.ro $*.lo $@!' > $@
@test -s $@ || rm -f $@
Makefile: $(srcdir)/Makefile.in config.status
config.status: $(srcdir)/configure
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(srcdir)/aclocal.m4
+$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && $(AUTOCONF)
weekly: $(srcdir)/weekly.in config.status
CONFIG_FILES=weekly CONFIG_HEADERS= $(SHELL) ./config.status
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
+$(LIBTOOL): $(LIBTOOL_DEPS)
+ $(SHELL) ./config.status --recheck
+
-include $(DEP_FILES)
projects / citadel.git / blobdiff