Fix error in Makefile.in , patch submitted by Adrian Bunk

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index f6c5084c635f5605fb2173892f95c238ea7474ca..cc27334d04f847bb877c3546f5cfa67c33b426c3 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -38,7 +38,7 @@ UTIL_TARGETS=citmail$(EXEEXT) sendcommand$(EXEEXT)
 
 UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
        chkpw$(EXEEXT) chkpwd$(EXEEXT) \
-       aidepost$(EXEEXT) msgform$(EXEEXT) \
+       msgform$(EXEEXT) \
        ctdlmigrate$(EXEEXT)
 
 
@@ -70,7 +70,7 @@ LOCALEDIR=@LOCALEDIR@
 .SILENT:
 
 
-SOURCES=utils/aidepost.c utils/citmail.c \
+SOURCES=utils/citmail.c \
        utils/setup.c utils/msgform.c utils/chkpw.c \
        utils/sendcommand.c \
        utils/ctdlmigrate.c utils/base64.c utils/chkpwd.c \
@@ -81,7 +81,7 @@ SOURCES=utils/aidepost.c utils/citmail.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 nttlist.c md5.c
+       context.c netconfig.c md5.c
 
 
 include Make_sources
@@ -136,7 +136,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o \
        internet_addressing.o journaling.o \
        parsedate.o genstamp.o ecrash.o threads.o context.o \
        clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
-       svn_revision.o ldap.o netconfig.o nttlist.o md5.o
+       svn_revision.o ldap.o netconfig.o md5.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
@@ -145,10 +145,6 @@ citserver$(EXEEXT): $(SERV_OBJS)
        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 \
                $(LDFLAGS) -o citmail$(EXEEXT) $(LIBS)
@@ -210,8 +206,7 @@ upgrade: install-exec install-doc
        @echo
 
 install-data:
-       @for i in messages network/spoolin \
-                network/spoolout; do \
+       @for i in messages network/spoolin ; do
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
        @for i in public_clients citadel_urlshorteners.rc \
@@ -225,13 +220,13 @@ install-data:
        fi
 
 install-data-new:
-       @for i in network/spoolin network/spoolout network/systems; do \
+       @for i in network/spoolin 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)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$
+       $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases
 
        $(srcdir)/mkinstalldirs $(DESTDIR)$(STATICDATA_DIR)/messages
        @for i in  \
@@ -240,7 +235,6 @@ install-data-new:
                $(INSTALL_DATA) $$i $(DESTDIR)$(STATICDATA_DIR)/$$i; \
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolin
-       $(srcdir)/mkinstalldirs $(DESTDIR)$(SPOOL_DIR)/network/spoolout
        -@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; \
@@ -348,7 +342,7 @@ cleaner: clean
 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 
+       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 \