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/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
@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}
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 \
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)
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 \
+ctdlmigrate$(EXEEXT): ctdlmigrate.o citadel_dirs.o
+ $(CC) 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)
+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
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
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