From c8fb43df3e34abd5a457a360e057e2b13256bb2e Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 12 Feb 2013 22:48:19 +0100 Subject: [PATCH] Finalize simplification of module detection. --- citadel/Makefile.in | 3 +-- citadel/scripts/mk_module_init.sh | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 4e95aee82..f4a23a539 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -31,7 +31,6 @@ all: buildinfo $(TARGETS) EXEEXT=@EXEEXT@ SERVER_TARGETS=citserver$(EXEEXT) -SERV_MODULES= ical_dezonify.o include Make_modules @@ -133,7 +132,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \ $(DATABASE:.c=.o) domain.o \ control.o config.o support.o room_ops.o \ file_ops.o msgbase.o euidindex.o \ - locate_host.o housekeeping.o \ + locate_host.o housekeeping.o ical_dezonify.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) \ diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh index 3ed51024c..f78fa8043 100755 --- a/citadel/scripts/mk_module_init.sh +++ b/citadel/scripts/mk_module_init.sh @@ -129,6 +129,8 @@ cat <> $H_FILE EOF done +grep CTDL_MODULE_UPGRADE *.c modules/*/*.c |$SED 's;.*(\(.*\));\CTDL_MODULE_UPGRADE(\1)\;\n;' >> $H_FILE + cat <> $H_FILE @@ -150,7 +152,7 @@ cat <$MOD_FILE SERV_MODULES = \\ EOF -echo modules/*/*.c | $SED "s;\.c ;.o \\\\\n;g" >> $MOD_FILE +echo modules/*/*.c | $SED -e "s;\.c ;.o \\\\\n;g" -e "s;\.c;.o;" >> $MOD_FILE echo >> $MOD_FILE @@ -170,7 +172,6 @@ cat <$SRC_FILE SOURCES = \\ EOF - echo modules/*/*.c | $SED "s;\.c ;.c \\\\\n;g" >> $SRC_FILE echo >> $SRC_FILE @@ -213,7 +214,7 @@ EOF # Add this entry point to the .c file -grep CTDL_MODULE_UPGRADE *.c modules/*/*.c |$SED 's;.*(\(.*\));\tpMod = CTDL_UPGRADE_CALL(\1)\;\n\tMOD_syslog(LOG_INFO, "%s\\n", pmod)\;\n;' >> $U_FILE +grep CTDL_MODULE_UPGRADE *.c modules/*/*.c |$SED 's;.*(\(.*\));\tpMod = CTDL_UPGRADE_CALL(\1)\;\n\tMOD_syslog(LOG_INFO, "%s\\n", pMod)\;\n;' >> $U_FILE #close the upgrade file /usr/bin/printf "}\n" >> $U_FILE -- 2.30.2