svn commit: samba r14875 - in branches/SAMBA_4_0/source/scripting: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-03 00:51:28 +0000 (Mon, 03 Apr 2006)
New Revision: 14875

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14875

Log:
Make better use of the build system

Modified:
   branches/SAMBA_4_0/source/scripting/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/scripting/config.mk
===================================================================
--- branches/SAMBA_4_0/source/scripting/config.mk	2006-04-03 00:46:17 UTC (rev 14874)
+++ branches/SAMBA_4_0/source/scripting/config.mk	2006-04-03 00:51:28 UTC (rev 14875)
@@ -3,56 +3,45 @@
 #######################
 # Start LIBRARY swig_tdb
 [LIBRARY::swig_tdb]
-REQUIRED_SUBSYSTEMS = LIBTDB
+LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
+OBJ_FILES = swig/tdb_wrap.o
+REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
 # End LIBRARY swig_tdb
 #######################
 
 #######################
 # Start LIBRARY swig_ldb
 [LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb
+REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
+OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
 
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+LIBRARY_REALNAME = swig/_dcerpc.$(SHLIBEXT)
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA DYNCONFIG
+OBJ_FILES = swig/dcerpc_wrap.o
 # End LIBRARY swig_dcerpc
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.so scripting/swig/_ldb.so
+swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
 
-scripting/swig/tdb_wrap.c: scripting/swig/tdb.i
-	swig -python scripting/swig/tdb.i
+.SUFFIXES: _wrap.c .i
 
-scripting/swig/_tdb.so: scripting/swig/tdb_wrap.o
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_tdb.so $(LOCAL_LINK_FLAGS) \
-		bin/libtdb.$(SHLIBEXT).0.0.1 \
-		scripting/swig/tdb_wrap.o
+.i_wrap.c:
+	swig -python $<
 
-scripting/swig/ldb_wrap.c: scripting/swig/ldb.i
-	swig -python scripting/swig/ldb.i
-
-scripting/swig/_ldb.so: scripting/swig/ldb_wrap.o $(LIBRARY_DYNCONFIG_OBJ_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_ldb.so $(LOCAL_LINK_FLAGS) \
-		$(LIBRARY_DYNCONFIG_LINK_LIST) \
-		bin/libtdb.$(SHLIBEXT).0.0.1 \
-		bin/libldb.$(SHLIBEXT).0.0.1 \
-		scripting/swig/ldb_wrap.o
-
 SWIG_INCLUDES = librpc/gen_ndr/samr.i librpc/gen_ndr/lsa.i librpc/gen_ndr/spoolss.i
 
 scripting/swig/dcerpc_wrap.c: scripting/swig/dcerpc.i scripting/swig/samba.i scripting/swig/status_codes.i $(SWIG_INCLUDES)
-	swig -python scripting/swig/dcerpc.i
 
-scripting/swig/_dcerpc.so: scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_DEPEND_LIST)
-	$(SHLD) $(SHLD_FLAGS) -o scripting/swig/_dcerpc.so scripting/swig/dcerpc_wrap.o $(LIBRARY_swig_dcerpc_LINK_LIST) $(LIBRARY_swig_dcerpc_LINK_FLAGS)
+clean::
+	-rm -f scripting/swig/tdb.pyc scripting/swig/tdb.py
 
-swig_clean:
-	-rm -f scripting/swig/_tdb.so scripting/swig/tdb.pyc scripting/swig/tdb.py scripting/swig/tdb_wrap.c scripting/swig/tdb_wrap.o
-
 # Swig testing
 
 swigtest: swig