s4:web_server: s/private/private_data

[ira/wip.git] / source4 / web_server / config.mk

diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index 00ae2ea8a028ac889f1d625ac5ba1c4221567a61..ff587508fc4be30a8b37b4fab92935fe5f0988e9 100644 (file)
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -1,41 +1,14 @@
 # web server subsystem
 
-#######################
-# Start SUBSYSTEM EJS
-[SUBSYSTEM::EJS]
-ADD_OBJ_FILES = \
-               web_server/ejs/ejs.o  \
-               web_server/ejs/ejsLex.o \
-               web_server/ejs/ejsParser.o \
-               web_server/ejs/ejsProcs.o \
-               web_server/ejs/miniMpr.o \
-               web_server/ejs/var.o
-NOPROTO=YES
-# End SUBSYSTEM EJS
-#######################
-
-#######################
-# Start SUBSYSTEM ESP
-[SUBSYSTEM::ESP]
-ADD_OBJ_FILES = \
-               web_server/esp/esp.o  \
-               web_server/esp/espProcs.o
-REQUIRED_SUBSYSTEMS = EJS
-NOPROTO=YES
-# End SUBSYSTEM ESP
-#######################
-
-
-
 #######################
 # Start SUBSYSTEM WEB
-[SUBSYSTEM::WEB]
-INIT_OBJ_FILES = \
-               web_server/web_server.o
-ADD_OBJ_FILES = \
-               web_server/http.o \
-               web_server/calls.o \
-               web_server/tls.o
-REQUIRED_SUBSYSTEMS = ESP
+[MODULE::WEB]
+INIT_FUNCTION = server_service_web_init
+SUBSYSTEM = service
+PRIVATE_DEPENDENCIES = LIBTLS smbcalls process_model LIBPYTHON
 # End SUBSYSTEM WEB
 #######################
+
+WEB_OBJ_FILES = $(addprefix $(web_serversrcdir)/, web_server.o wsgi.o) 
+
+$(eval $(call proto_header_template,$(web_serversrcdir)/proto.h,$(WEB_OBJ_FILES:.o=.c)))