r14968: Move tdb and ldb swig wrappers in to lib/tdb and lib/ldb directories.

(This used to be commit fa8d0dc14a1af9567401d54a803b34a6498b7cd4)

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index a2a6e9ef73a21dde074e8c992825642872adfded..59c316c8c1376e5c5aa28f751d8958d5efb65856 100644 (file)
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -272,3 +272,12 @@ REQUIRED_SUBSYSTEMS = \
                LIBLDB_CMDLINE
 # End BINARY oLschema2ldif
 ################################################
+
+#######################
+# Start LIBRARY swig_ldb
+[LIBRARY::swig_ldb]
+REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
+LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
+OBJ_FILES = swig/ldb_wrap.o
+# End LIBRARY swig_ldb
+#######################

diff --git a/source4/scripting/swig/Ldb.py b/source4/lib/ldb/swig/Ldb.py
similarity index 100%
rename from source4/scripting/swig/Ldb.py
rename to source4/lib/ldb/swig/Ldb.py

diff --git a/source4/scripting/swig/ldb.i b/source4/lib/ldb/swig/ldb.i
similarity index 100%
rename from source4/scripting/swig/ldb.i
rename to source4/lib/ldb/swig/ldb.i

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 82119d04ca6b1891deabf938e8d53a81849ed10c..3cb9b793ad7ff03ca39a84a8f1e2262ba8a3c2b4 100644 (file)
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -60,3 +60,12 @@ REQUIRED_SUBSYSTEMS = \
                LIBTDB
 # End BINARY tdbbackup
 ################################################
+
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT)
+OBJ_FILES = swig/tdb_wrap.o
+REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
+# End LIBRARY swig_tdb
+#######################

diff --git a/source4/scripting/swig/Tdb.py b/source4/lib/tdb/swig/Tdb.py
similarity index 100%
rename from source4/scripting/swig/Tdb.py
rename to source4/lib/tdb/swig/Tdb.py

diff --git a/source4/scripting/swig/tdb.i b/source4/lib/tdb/swig/tdb.i
similarity index 100%
rename from source4/scripting/swig/tdb.i
rename to source4/lib/tdb/swig/tdb.i

diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index e0a265b6791774eac93b933fd5f5f7a9dc6a980a..9dba88b2992e477d86d104aaaa69b375a236b391 100644 (file)
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,21 +1,3 @@
-#######################
-# Start LIBRARY swig_tdb
-[LIBRARY::swig_tdb]
-LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
-OBJ_FILES = tdb_wrap.o
-REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG
-# End LIBRARY swig_tdb
-#######################
-
-#######################
-# Start LIBRARY swig_ldb
-[LIBRARY::swig_ldb]
-REQUIRED_SUBSYSTEMS = ldb DYNCONFIG
-LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
-OBJ_FILES = ldb_wrap.o
-# End LIBRARY swig_ldb
-#######################
-
 #######################
 # Start LIBRARY swig_dcerpc
 [LIBRARY::swig_dcerpc]
@@ -26,7 +8,7 @@ OBJ_FILES = dcerpc_wrap.o
 #######################
 
 # Swig extensions
-swig: scripting/swig/_tdb.$(SHLIBEXT) scripting/swig/_ldb.$(SHLIBEXT)
+swig: lib/tdb/swig/_tdb.$(SHLIBEXT) lib/ldb/swig/_ldb.$(SHLIBEXT)
 
 .SUFFIXES: _wrap.c .i