summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2006-04-08 00:40:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:00:48 -0500
commit8c23f133c4a1cd58a83c837bcd8f77b739e87ff2 (patch)
treeaefd60494d28ee850e8838f6021b74e15a895db0
parent35ee2474874676184ec94d19f70e02b6459cfd9c (diff)
downloadsamba-8c23f133c4a1cd58a83c837bcd8f77b739e87ff2.tar.gz
samba-8c23f133c4a1cd58a83c837bcd8f77b739e87ff2.tar.bz2
samba-8c23f133c4a1cd58a83c837bcd8f77b739e87ff2.zip
r14968: Move tdb and ldb swig wrappers in to lib/tdb and lib/ldb directories.
(This used to be commit fa8d0dc14a1af9567401d54a803b34a6498b7cd4)
-rw-r--r--source4/lib/ldb/config.mk9
-rw-r--r--source4/lib/ldb/swig/Ldb.py (renamed from source4/scripting/swig/Ldb.py)0
-rw-r--r--source4/lib/ldb/swig/ldb.i (renamed from source4/scripting/swig/ldb.i)0
-rw-r--r--source4/lib/tdb/config.mk9
-rw-r--r--source4/lib/tdb/swig/Tdb.py (renamed from source4/scripting/swig/Tdb.py)0
-rw-r--r--source4/lib/tdb/swig/tdb.i (renamed from source4/scripting/swig/tdb.i)0
-rw-r--r--source4/scripting/swig/config.mk20
7 files changed, 19 insertions, 19 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index a2a6e9ef73..59c316c8c1 100644
--- 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
index f761aec398..f761aec398 100644
--- a/source4/scripting/swig/Ldb.py
+++ b/source4/lib/ldb/swig/Ldb.py
diff --git a/source4/scripting/swig/ldb.i b/source4/lib/ldb/swig/ldb.i
index 31c1ffe3e4..31c1ffe3e4 100644
--- a/source4/scripting/swig/ldb.i
+++ b/source4/lib/ldb/swig/ldb.i
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 82119d04ca..3cb9b793ad 100644
--- 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
index ef0165ed8b..ef0165ed8b 100644
--- a/source4/scripting/swig/Tdb.py
+++ b/source4/lib/tdb/swig/Tdb.py
diff --git a/source4/scripting/swig/tdb.i b/source4/lib/tdb/swig/tdb.i
index 8f473c61e6..8f473c61e6 100644
--- a/source4/scripting/swig/tdb.i
+++ b/source4/lib/tdb/swig/tdb.i
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
index e0a265b679..9dba88b299 100644
--- a/source4/scripting/swig/config.mk
+++ b/source4/scripting/swig/config.mk
@@ -1,22 +1,4 @@
#######################
-# 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]
LIBRARY_REALNAME = _dcerpc.$(SHLIBEXT)
@@ -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