r15301: Use static libraries internally. This required a few hacks in the build

[abartlet/samba.git/.git] / source4 / web_server / config.mk

diff --git a/source4/web_server/config.mk b/source4/web_server/config.mk
index b287b4f153f2e626e03565b25652aeda77e6eb34..f6f6113eda953fb76c71ad873c83aac6b190d399 100644 (file)
--- a/source4/web_server/config.mk
+++ b/source4/web_server/config.mk
@@ -1,40 +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
-REQUIRED_SUBSYSTEMS = ESP
+[MODULE::WEB]
+INIT_FUNCTION = server_service_web_init
+SUBSYSTEM = service
+PRIVATE_PROTO_HEADER = proto.h
+OBJ_FILES = \
+               web_server.o \
+               http.o
+PUBLIC_DEPENDENCIES = ESP LIBTLS smbcalls process_model
 # End SUBSYSTEM WEB
 #######################