Add build system bits for wmi.

diff --git a/source4/Makefile b/source4/Makefile
index 66b092192e45584bbe85577876114c2b17c31ba7..546eb072d8611ed40370936fe1468ee3ee9f9951 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -102,6 +102,7 @@ ejsscriptsrcdir := scripting/ejs
 pyscriptsrcdir := $(srcdir)/scripting/python
 kdcsrcdir := kdc
 ntp_signdsrcdir := ntp_signd
+wmisrcdir := lib/wmi
 
 include data.mk
 

diff --git a/source4/lib/wmi/config.mk b/source4/lib/wmi/config.mk
index 086a2cbba9cbd95a0f0c2c8da0d9428462811490..b51180187d7772a17aa4ac5ca698cd4f28c8685d 100644 (file)
--- a/source4/lib/wmi/config.mk
+++ b/source4/lib/wmi/config.mk
@@ -1,5 +1,4 @@
 [SUBSYSTEM::WMI]
-PRIVATE_PROTO_HEADER = proto.h
 PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
                NDR_DCOM \
                RPC_NDR_REMACT \
@@ -7,7 +6,9 @@ PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
                DCOM_PROXY_DCOM \
                DCOM
 
-WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
+WMI_OBJ_FILES = $(addprefix $(wmisrcdir)/, wmicore.o wbemdata.o ../../librpc/gen_ndr/dcom_p.o)
+
+$(eval $(call proto_header_template,$(wmisrcdir)/proto.h,$(WMI_OBJ_FILES:.o=.c)))
 
 #################################
 # Start BINARY wmic
@@ -19,7 +20,7 @@ PRIVATE_DEPENDENCIES = \
                 LIBPOPT \
                                WMI
 
-wmic_OBJ_FILES = lib/wmi/tools/wmic.o
+wmic_OBJ_FILES = $(wmisrcdir)/tools/wmic.o
 # End BINARY wmic
 #################################
 
@@ -34,7 +35,7 @@ PRIVATE_DEPENDENCIES = \
                                WMI
 
 wmis_OBJ_FILES = \
-                lib/wmi/tools/wmis.o
+                $(wmisrcdir)/tools/wmis.o
 
 # End BINARY wmis
 #################################
@@ -45,7 +46,8 @@ librpc/gen_ndr/dcom_p.c: idl
 # Start LIBRARY swig_dcerpc
 [PYTHON::pywmi]
 PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI
-SWIG_FILE = pywmi.i
+
+pywmi_OBJ_FILES = $(wmisrcdir)/pywmi_wrap.o
 
 # End LIBRARY swig_dcerpc
 #######################

diff --git a/source4/main.mk b/source4/main.mk
index 28db54c10f78035cd27bc868cbf1bb0373538f24..d44716e4c0e6c9404412809b1b89eed536a2c1a4 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -47,3 +47,4 @@ mkinclude libcli/config.mk
 mkinclude scripting/ejs/config.mk
 mkinclude scripting/python/config.mk
 mkinclude kdc/config.mk
+mkinclude lib/wmi/config.mk