X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2FMakefile.in;h=83d2bcb1cbd15cf01778c35c1f30657a6427c5cf;hb=fe70bc8314205d9c32da7c73e5bf1c58ee1a67f6;hp=16ca85fd348707aef67526f468e0e792af0d3962;hpb=421c6e0bce6917ae9d09ae066c77fb58b964c399;p=citadel.git

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 16ca85fd3..83d2bcb1c 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -1,12 +1,12 @@
-# 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.
 #
 ########################################################################
 
@@ -44,18 +44,18 @@ 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@
+LDFLAGS=@LDFLAGS@ -rdynamic
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
-SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LDFLAGS=@SERVER_LDFLAGS@ -rdynamic
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
@@ -68,19 +68,16 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/citmail.c \
-	utils/setup.c utils/chkpw.c \
-	utils/sendcommand.c \
-	utils/ctdlmigrate.c utils/chkpwd.c \
-	utillib/citadel_dirs.c \
+SOURCES=citmail.c setup.c chkpw.c \
+	sendcommand.c  ctdlmigrate.c chkpwd.c \
+	citadel_dirs.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
 	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 netconfig.c md5.c
-
+	context.c netconfig.c
 
 include Make_sources
 
@@ -96,7 +93,6 @@ mkdir-init:
 	@for d in `/bin/ls $(VPATH)/user_modules/`; do \
 		(mkdir -p user_modules/$$d ) ; \
 	done
-	mkdir -p utils utillib
 	mkdir locale
 
 svn_revision.c: ${SOURCES}
@@ -114,9 +110,6 @@ utils: $(UTIL_TARGETS) $(UTILBIN_TARGETS)
 	$(YACC) $(YFLAGS) $<
 	mv -f y.tab.c $@
 
-#
-#
-
 parsedate.o: parsedate.c
 
 Make_sources: modules_init.c
@@ -125,7 +118,7 @@ Make_modules: modules_init.c
 
 modules_upgrade.c: modules_init.c
 
-SERV_OBJS = server_main.o utillib/citadel_dirs.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 \
@@ -134,7 +127,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \
 	internet_addressing.o journaling.o \
 	parsedate.o genstamp.o threads.o context.o \
 	clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
-	svn_revision.o ldap.o netconfig.o md5.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)
@@ -143,28 +136,28 @@ citserver$(EXEEXT): $(SERV_OBJS)
 	echo "CC $<"
 	$(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
-citmail$(EXEEXT): utils/citmail.o utillib/citadel_dirs.o
-	$(CC) utils/citmail.o utillib/citadel_dirs.o \
+citmail$(EXEEXT): citmail.o citadel_dirs.o
+	$(CC) 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): setup.o citadel_dirs.o
+	$(CC) 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 \
-		$(LDFLAGS) -o ctdlmigrate$(EXEEXT) $(LIBS)
+ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
+	$(CC) ctdlmigrate.o citadel_dirs.o \
+		$(LDFLAGS) -lreadline -o ctdlmigrate$(EXEEXT) $(LIBS)
 
-chkpwd$(EXEEXT): utils/chkpwd.o auth.o
-	$(CC) utils/chkpwd.o auth.o $(LDFLAGS) -o chkpwd$(EXEEXT) $(chkpwd_LIBS)
+chkpwd$(EXEEXT): chkpwd.o auth.o
+	$(CC) 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): chkpw.o auth.o citadel_dirs.o
+	$(CC) chkpw.o auth.o citadel_dirs.o \
 		$(LDFLAGS) -o chkpw$(EXEEXT) $(chkpwd_LIBS)
 
-sendcommand$(EXEEXT): utils/sendcommand.o utillib/citadel_dirs.o $(LIBOBJS)
-	$(CC) utils/sendcommand.o utillib/citadel_dirs.o \
+sendcommand$(EXEEXT): sendcommand.o citadel_dirs.o $(LIBOBJS)
+	$(CC) sendcommand.o citadel_dirs.o \
 		$(LIBOBJS) $(LDFLAGS) -o sendcommand$(EXEEXT) $(LIBS)
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
@@ -200,11 +193,6 @@ upgrade: install-exec install-doc
 
 install-data:
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/messages
-	@for i in public_clients \
-		 `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
 	-@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; \
@@ -212,8 +200,6 @@ install-data:
 
 install-data-new:
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
-	$(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
-	$(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases
 
 	$(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
 	@for i in  \
@@ -302,8 +288,7 @@ install-exec-new: all
 clean:
 	rm -vfr locale/*
 	rm -vf *.o 
-	rm -vf utils/*.o ;\
-	rm -vf utillib/*.o ;\
+	rm -vf *.o ;\
 	for i in $(srcdir)/modules/* ; do \
 		rm -vf $$i/*.o ;\
 	done
@@ -314,17 +299,14 @@ clean:
 	fi
 	rm -vf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS)
 
-
 cleaner: clean
-	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) database_cleanup.sh *.la
+	rm -vrf $(SERVER_TARGETS) $(UTIL_TARGETS) $(UTILBIN_TARGETS) $(NOINST_TARGETS) *.la
 	rm -vrf modules_upgrade.c modules_init.c modules_init.h Make_modules Make_sources
 
 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 package-version.txt
-	rm -vf utils/*.d ;
-	rm -vf utillib/*.d ;
 	for i in $(srcdir)/modules/* ; do \
 		rm -vf $$i/*.d ;\
 	done