Fix old style syntax in mk files .

3 files changed, 59 insertions, 55 deletions

diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 4d076684cd..999ed7717e 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -1,6 +1,28 @@
-[SUBSYSTEM::LZXPRESS]
-
-LZXPRESS_OBJ_FILES = $(libcompressionsrcdir)/lzxpress.o
+# LIB BASIC subsystem
+mkinclude samba3/config.mk
+mkinclude socket/config.mk
+mkinclude charset/config.mk
+mkinclude ldb-samba/config.mk
+mkinclude tls/config.mk
+mkinclude registry/config.mk
+mkinclude messaging/config.mk
+mkinclude events/config.mk
+mkinclude cmdline/config.mk
+mkinclude socket_wrapper/config.mk
+mkinclude nss_wrapper/config.mk
+mkinclude appweb/config.mk
+mkinclude stream/config.mk
+mkinclude util/config.mk
+mkinclude tdr/config.mk
+mkinclude dbwrap/config.mk
+mkinclude crypto/config.mk
+mkinclude torture/config.mk
+mkinclude com/config.mk
+mkinclude wmi/config.mk
+
+[SUBSYSTEM::LIBCOMPRESSION]
+
+LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
 
 [SUBSYSTEM::GENCACHE]
 PRIVATE_DEPENDENCIES = TDB_WRAP
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk
index 08c459a5f6..24634db1ba 100644
--- a/source4/lib/com/config.mk
+++ b/source4/lib/com/config.mk
@@ -1,23 +1,17 @@
-[LIBRARY::com]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::COM]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = \
-		tables.o \
-		rot.o \
-		main.o
 
-[LIBRARY::dcom]
-VERSION = 0.0.1
-SO_VERSION = 0
+COM_OBJ_FILES = $(addprefix lib/com/, tables.o rot.o main.o)
+
+[SUBSYSTEM::DCOM]
 PRIVATE_PROTO_HEADER = dcom/proto.h
-OBJ_FILES = \
-		dcom/main.o \
-		dcom/tables.o
 PUBLIC_DEPENDENCIES = com DCOM_PROXY_DCOM RPC_NDR_REMACT \
 					  RPC_NDR_OXIDRESOLVER
 
+DCOM_OBJ_FILES = $(addprefix lib/com/dcom/, main.o tables.o)
+
 [MODULE::com_simple]
-SUBSYSTEM = com
-OBJ_FILES = classes/simple.o
+SUBSYSTEM = COM
 INIT_FUNCTION = com_simple_init
+
+com_simple_OBJ_FILES = lib/com/classes/simple.o
diff --git a/source4/lib/wmi/config.mk b/source4/lib/wmi/config.mk
index 1899822ff0..84beb7161d 100644
--- a/source4/lib/wmi/config.mk
+++ b/source4/lib/wmi/config.mk
@@ -1,23 +1,25 @@
+[SUBSYSTEM::WMI]
+PUBLIC_DEPENDENCIES = RPC_NDR_OXIDRESOLVER \
+		NDR_DCOM \
+		RPC_NDR_REMACT \
+		NDR_TABLE \
+		DCOM_PROXY_DCOM \
+		DCOM
+
+WMI_OBJ_FILES = $(addprefix lib/wmi/, wmicore.o wbemdata.o ../librpc/gen_ndr/dcom_p.o)
+
 #################################
 # Start BINARY wmic
 [BINARY::wmic]
 PRIVATE_PROTO_HEADER = proto.h
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-                wmic.o \
-		wmicore.o \
-		wbemdata.o \
-		../librpc/gen_ndr/dcom_p.o
 PRIVATE_DEPENDENCIES = \
                 POPT_SAMBA \
                 POPT_CREDENTIALS \
                 LIBPOPT \
-		RPC_NDR_OXIDRESOLVER \
-		NDR_DCOM \
-		RPC_NDR_REMACT \
-		NDR_TABLE \
-		DCOM_PROXY_DCOM \
-		dcom
+				WMI
+
+wmic_OBJ_FILES = lib/wmi/tools/wmic.o
 # End BINARY wmic
 #################################
 
@@ -25,21 +27,18 @@ PRIVATE_DEPENDENCIES = \
 # Start BINARY wmis
 [BINARY::wmis]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-                wmis.o \
-		wmicore.o \
-		wbemdata.o \
-		../librpc/gen_ndr/dcom_p.o
 PRIVATE_DEPENDENCIES = \
                 POPT_SAMBA \
                 POPT_CREDENTIALS \
                 LIBPOPT \
-		RPC_NDR_OXIDRESOLVER \
-		NDR_DCOM \
-		RPC_NDR_REMACT \
-		NDR_TABLE \
-		DCOM_PROXY_DCOM \
-		dcom
+				WMI
+
+wmis_OBJ_FILES = \
+                wmis.o \
+		wmicore.o \
+		wbemdata.o \
+		../librpc/gen_ndr/dcom_p.o
+
 # End BINARY wmis
 #################################
 
@@ -47,20 +46,10 @@ librpc/gen_ndr/dcom_p.c: idl
 
 #######################
 # Start LIBRARY swig_dcerpc
-[LIBRARY::pywmi]
-LIBRARY_REALNAME = _pywmi.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG \
-		RPC_NDR_OXIDRESOLVER \
-		NDR_DCOM \
-		RPC_NDR_REMACT \
-		NDR_TABLE \
-		DCOM_PROXY_DCOM \
-		dcom \
-		RPC_NDR_WINREG
-OBJ_FILES = wbemdata.o \
-	    wmicore.o \
-	    ../librpc/gen_ndr/dcom_p.o \
-	    pywmi_wrap.o
+[PYTHON::pywmi]
+PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG WMI
+SWIG_FILE = pywmi.i
+
 # End LIBRARY swig_dcerpc
 #######################
 
@@ -78,4 +67,3 @@ OBJ_FILES = wbemdata.o \
 #		RPC_NDR_WINREG
 # End BINARY pdhc
 #################################
-