all: $(TARGETS)
-.SUFFIXES: .lo .ro .d .c
+.SUFFIXES: .o .d .c
EXEEXT=@EXEEXT@
-CX=@CX@
SMTP=@SMTP@
CLIENT_TARGETS=citadel$(EXEEXT) whobbs$(EXEEXT)
-SERVER_TARGETS=libcitserver.la citserver setup $(CHKPWD)
-SERV_MODULES=modules/libchat.la modules/libvcard.la \
- modules/libupgrade.la \
+SERVER_TARGETS=citserver setup $(CHKPWD)
+SERV_MODULES=serv_chat.o \
+ serv_upgrade.o \
$(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 netsetup msgform readlog \
+ 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_tools.o \
+ serv_network.o \
+ serv_listsub.o \
+ serv_netfilter.o \
+ serv_newuser.o \
+ serv_pas2.o md5.o \
+ serv_inetcfg.o \
+ serv_rwho.o \
+ serv_bio.o \
+ serv_expire.o \
+ serv_vandelay.o \
+ serv_calendar.o ical_dezonify.o
+
+UTIL_TARGETS=aidepost msgform readlog \
stats citmail userlist sendcommand \
- base64 qpdecode
+ base64 migratenet$(EXEEXT)
prefix=@prefix@
srcdir=@srcdir@
CPPFLAGS=@CPPFLAGS@ -I.
CFLAGS=@CFLAGS@
CC=@CC@
-GDBM=@GDBM@
RESOLV=@RESOLV@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@
-CURSES=@CURSES@
-NETLIBS=@NETLIBS@
chkpwd_LIBS=@chkpwd_LIBS@
LIBOBJS=@LIBOBJS@
-CL_LIBOBJS=@CL_LIBOBJS@
-PTHREAD_DEFS=@PTHREAD_DEFS@
-PTHREAD_LIBS=@PTHREAD_LIBS@
-CLIENT_PTLIBS=@CLIENT_PTLIBS@
INSTALL=@INSTALL@
INSTALL_DATA=@INSTALL_DATA@
SHELL=/bin/sh
AUTOCONF=@AUTOCONF@
+ACLOCAL=@ACLOCAL@
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 ipc_c_tcp.c locate_host.c \
- logging.c messages.c msgbase.c msgform.c \
- netsetup.c policy.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) 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 server_main.c
+SOURCES=aidepost.c auth.c base64.c chkpwd.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) serv_extensions.c file_ops.c genstamp.c getutline.c \
+ housekeeping.c html.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 logging.c md5.c messages.c migratenet.c \
+ mime_parser.c msgbase.c msgform.c parsedate.c policy.c \
+ readlog.c room_ops.c rooms.c routines.c routines2.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 server_main.c setup.c snprintf.c \
+ stats.c support.c sysdep.c tools.c user_ops.c userlist.c \
+ whobbs.c vcard.c ical_dezonify.c
DEP_FILES=$(SOURCES:.c=.d)
client: $(CLIENT_TARGETS)
-server: $(SERVER_TARGETS)
+server: $(SERVER_TARGETS) $(SERV_MODULES)
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
-
-#
-#
-
-citadel$(EXEEXT): ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
- routines2$(CX) messages$(CX) \
- client_passwords$(CX) md5$(CX) \
- commands$(CX) client_chat$(CX) serv_info$(CX) tools$(CX) $(LIBOBJS)
- $(CC) ipc_c_tcp$(CX) citadel$(CX) rooms$(CX) routines$(CX) \
- routines2$(CX) messages$(CX) \
- commands$(CX) client_chat$(CX) serv_info$(CX) tools$(CX) \
- client_passwords$(CX) md5$(CX) \
- $(LIBOBJS) $(LDFLAGS) -o citadel $(NETLIBS) $(CLIENT_PTLIBS)
-
-.c.o:
- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $<
+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 $(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 $(LIBOBJS) \
+ $(LDFLAGS) -o citadel $(LIBS)
.y.c:
$(YACC) $(YFLAGS) $<
#
#
-SERV_OBJS = server_main.ro
-
-parsedate.ro: parsedate.c
-
-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.lo: $(LIBTOOL)
- @test -d modules || mkdir -p modules
- $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(PTHREAD_DEFS) -c $< -o $@
-
-modules/libchat.la: serv_chat.lo libcitserver.la $(LIBTOOL)
- $(LTSHARE) -o libchat.la ../serv_chat.lo ../libcitserver.la
-
-modules/libtest.la: serv_test.lo libcitserver.la $(LIBTOOL)
- $(LTSHARE) -o libtest.la ../serv_test.lo ../libcitserver.la
-
-modules/libpop3.la: serv_pop3.lo md5.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libpop3.la ../serv_pop3.lo ../md5.lo ../libcitserver.la
-
-modules/libinetcfg.la: serv_inetcfg.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libinetcfg.la ../serv_inetcfg.lo ../libcitserver.la
-
-modules/librwho.la: serv_rwho.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o librwho.la ../serv_rwho.lo ../libcitserver.la
+parsedate.o: parsedate.c
-modules/libmoderate.la: serv_moderate.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libmoderate.la ../serv_moderate.lo ../libcitserver.la
+SERV_OBJS = server_main.o \
+ user_ops.o citserver.o sysdep.o serv_extensions.o \
+ tools.o $(DATABASE:.c=.o) $(DOMAIN:.c=.o) \
+ control.o policy.o config.o support.o room_ops.o \
+ file_ops.o msgbase.o \
+ locate_host.o housekeeping.o logging.o mime_parser.o html.o \
+ internet_addressing.o \
+ serv_crypto.o parsedate.o genstamp.o \
+ clientsocket.o $(AUTH) $(SERV_MODULES)
-modules/libbio.la: serv_bio.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libbio.la ../serv_bio.lo ../libcitserver.la
+citserver: $(SERV_OBJS)
+ $(CC) $(SERV_OBJS) $(LDFLAGS) $(LIBS) $(RESOLV) -o citserver
-modules/libexpire.la: serv_expire.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libexpire.la ../serv_expire.lo ../libcitserver.la
-
-modules/libvandelay.la: serv_vandelay.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libvandelay.la ../serv_vandelay.lo ../libcitserver.la
-
-modules/libnetwork.la: serv_network.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libnetwork.la ../serv_network.lo ../libcitserver.la
-
-modules/libupgrade.la: serv_upgrade.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libupgrade.la ../serv_upgrade.lo ../libcitserver.la
-
-modules/libvcard.la: serv_vcard.lo vcard.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libvcard.la ../serv_vcard.lo ../vcard.lo ../libcitserver.la
-
-modules/libsmtp.la: serv_smtp.lo domain.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libsmtp.la ../serv_smtp.lo ../domain.lo ../libcitserver.la
-
-
-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
-
-aidepost: aidepost.o libcitserver.la $(LIBOBJS)
- $(LIBTOOL) $(CC) aidepost.o libcitserver.la $(LIBOBJS) $(LDFLAGS) -o aidepost
-
-modules/libpas2.la: serv_pas2.lo md5.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libpas2.la ../serv_pas2.lo ../md5.lo ../libcitserver.la
+.c.o:
+ $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
-modules/libical.la: serv_ical.lo $(LIBTOOL) libcitserver.la
- $(LTSHARE) -o libical.la ../serv_ical.lo ../libcitserver.la
+aidepost: aidepost.o config.o
+ $(CC) aidepost.o config.o $(LDFLAGS) -o aidepost $(LIBS)
citmail: citmail.o config.o
- $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(NETLIBS)
+ $(CC) citmail.o config.o $(LDFLAGS) -o citmail $(LIBS)
setup: setup.o tools.o
- $(CC) setup.o tools.o $(CURSES) $(NETLIBS) $(LDFLAGS) -o setup
+ $(CC) setup.o tools.o $(LIBS) $(LDFLAGS) -o setup
chkpwd: chkpwd.o auth.o config.o
$(CC) chkpwd.o auth.o config.o $(LDFLAGS) -o chkpwd $(chkpwd_LIBS)
-netsetup: netsetup.o config.o
- $(CC) netsetup.o config.o $(LDFLAGS) -o netsetup
-
-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)
+whobbs$(EXEEXT): whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o $(LIBOBJS)
+ $(CC) whobbs.o ipc_c_tcp.o tools.o citadel_ipc.o $(LIBOBJS) $(LDFLAGS) -o whobbs $(LIBS)
-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)
+migratenet$(EXEEXT): migratenet.o config.o ipc_c_tcp.o citadel_ipc.o tools.o $(LIBOBJS)
+ $(CC) migratenet.o config.o ipc_c_tcp.o citadel_ipc.o tools.o $(LIBOBJS) $(LDFLAGS) -o migratenet $(LIBS)
-qpdecode: qpdecode.o
- $(CC) qpdecode.o $(LDFLAGS) -o qpdecode
+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 \
+ $(LIBOBJS) $(LDFLAGS) -o sendcommand $(LIBS)
base64: base64.o
$(CC) base64.o $(LDFLAGS) -o base64
-userlist: userlist.o ipc_c_tcp.o tools.o $(LIBOBJS)
- $(CC) userlist.o ipc_c_tcp.o tools.o \
- $(LIBOBJS) $(LDFLAGS) -o userlist $(NETLIBS)
+userlist: userlist.o ipc_c_tcp.o citadel_ipc.o tools.o $(LIBOBJS)
+ $(CC) userlist.o ipc_c_tcp.o citadel_ipc.o tools.o \
+ $(LIBOBJS) $(LDFLAGS) -o userlist $(LIBS)
msgform: msgform.o
$(CC) msgform.o $(LDFLAGS) -o msgform
readlog: readlog.o config.o
$(CC) readlog.o config.o $(LDFLAGS) -o readlog
-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)
+stats: stats.o ipc_c_tcp.o citadel_ipc.o tools.o config.o
+ $(CC) stats.o ipc_c_tcp.o citadel_ipc.o tools.o config.o $(LDFLAGS) -o stats $(LIBS)
.PHONY: install-data install-doc install-exec clean cleaner distclean
done
install-exec: all weekly
- @for i in bio bitbucket files images info modules userpics; do \
+ @for i in bio bitbucket files images info userpics; do \
$(srcdir)/mkinstalldirs $(root)$(prefix)/$$i; \
done
@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 \
- (cd modules && ../$(LIBTOOL) --mode=install $(INSTALL) `basename $$i` $(root)$(prefix)/$$i) ; \
+ echo $(INSTALL) $$i $(root)$(prefix)/$$i; \
+ $(INSTALL) $$i $(root)$(prefix)/$$i; \
fi \
done
- @for i in utilsmenu weekly dnetsetup; do \
+ @for i in utilsmenu weekly ; do \
if test -f $(srcdir)/$$i; then \
echo $(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
$(INSTALL) $(srcdir)/$$i $(root)$(prefix)/$$i; \
fi
clean:
- rm -f *.o *.ro *.lo parsedate.c
+ rm -f *.o parsedate.c
cleaner: clean
- rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) \
- modules/*.la modules/.libs so_locations
+ rm -rf $(CLIENT_TARGETS) $(SERVER_TARGETS) $(UTIL_TARGETS) *.la
distclean: cleaner
find . -name '*~' -o -name '.#*' | xargs rm -f
- rm -f Makefile sysdep.h config.cache config.log config.status *.d weekly
+ rm -f Makefile sysdep.h config.cache config/.og config.status *.d weekly
.c.d:
@echo Checking dependencies for $<
- @$(CC) -M $(CPPFLAGS) $(PTHREAD_DEFS) $< | sed -e 's!$*.o!$*.o $*.ro $*.lo $@!' > $@
+ @$(CC) -M $(CPPFLAGS) $< | sed -e 's!$*.o!$*.o $*/.o $@!' > $@
@test -s $@ || rm -f $@
Makefile: $(srcdir)/Makefile.in config.status
$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
cd $(srcdir) && $(AUTOCONF)
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+ cd $(srcdir) && $(ACLOCAL)
+
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