Moved some files around into sub dirs to clean up the base dir a litle.

[citadel.git] / citadel / mk_module_init.sh

diff --git a/citadel/mk_module_init.sh b/citadel/mk_module_init.sh
index 96f3ee74baafc4a121c886fc519c3f439e359725..9ea76c8fdde01b37969e4955d956cd2419af91a7 100755 (executable)
--- a/citadel/mk_module_init.sh
+++ b/citadel/mk_module_init.sh
@@ -64,11 +64,13 @@ cat <<EOF  >$U_FILE
 
 #include "sysdep.h"
 #include <stdlib.h>
+#include <unistd.h>
 #include <time.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "modules_init.h"
 #include "sysdep_decls.h"
@@ -99,6 +101,7 @@ cat <<EOF  >$C_FILE
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <libcitadel.h>
 #include "citadel.h"
 #include "modules_init.h"
 #include "sysdep_decls.h"
@@ -118,6 +121,17 @@ void initialise_modules (int threading)
         CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads enabled.\n");
     else
         CtdlLogPrintf (CTDL_INFO, "Initialise modules, CtdlThreads not yet enabled.\n");
+/* static server initialization: */
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(citserver));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(control));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(euidindex));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(file_ops));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(msgbase));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(policy));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(room_ops));
+        CtdlLogPrintf (CTDL_INFO, "%s\n", CTDL_INIT_CALL(user_ops));
+/* dynamic modules: */
+
 EOF
 
 
@@ -135,6 +149,15 @@ cat <<EOF > $H_FILE
 extern size_t nSizErrmsg;
 void initialise_modules (int threading);
 void upgrade_modules(void);
+
+       CTDL_MODULE_INIT(citserver);
+       CTDL_MODULE_INIT(control);
+       CTDL_MODULE_INIT(euidindex);
+       CTDL_MODULE_INIT(file_ops);
+       CTDL_MODULE_INIT(msgbase);
+       CTDL_MODULE_INIT(policy);
+       CTDL_MODULE_INIT(room_ops);
+       CTDL_MODULE_INIT(user_ops);
 EOF
 
 for i in serv_*.c
@@ -234,7 +257,7 @@ if [ -d "user_modules" ] ; then
                                if [ -f "$k" ] ; then
 # Add this .c file to the Makefile included list of SOURCES
 cat <<EOF >> $SRC_FILE
-SOURCES=\$(SOURCES) user_modules/$j/$k
+SOURCES += user_modules/$j/$k
 EOF
 
 # Generate a .o file name