summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-05-29 00:22:34 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:17:10 -0500
commit10f428b6075698205d282c13bc9b1c21f106e165 (patch)
tree916b28d40d7b5aba706ca4d2d8b879395daba494
parentf52a74021512aace67f7ecba33ed130102f47533 (diff)
downloadsamba-10f428b6075698205d282c13bc9b1c21f106e165.tar.gz
samba-10f428b6075698205d282c13bc9b1c21f106e165.tar.bz2
samba-10f428b6075698205d282c13bc9b1c21f106e165.zip
r7062: Merge scripting/swig/config.mk with scripting/config.mk
(This used to be commit e14c00c4c1cc51dac9452c1e950445907d883e46)
-rw-r--r--source4/build/smb_build/main.pm1
-rw-r--r--source4/scripting/config.mk14
-rw-r--r--source4/scripting/swig/config.mk5
3 files changed, 14 insertions, 6 deletions
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 593064c75f..758346b421 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -63,7 +63,6 @@ sub smb_build_main($)
"libcli/security/config.mk",
"lib/com/config.mk",
"scripting/config.mk",
- "scripting/swig/config.mk",
);
$| = 1;
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 31f7e6df9d..0ea102deee 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -6,3 +6,17 @@ OBJ_FILES = \
REQUIRED_SUBSYSTEMS = EJS LIBBASIC
# End BINARY SMBSCRIPT
#######################
+
+#######################
+# Start LIBRARY swig_tdb
+[LIBRARY::swig_tdb]
+REQUIRED_SUBSYSTEMS = LIBTDB
+# End LIBRARY swig_tdb
+#######################
+
+#######################
+# Start LIBRARY swig_dcerpc
+[LIBRARY::swig_dcerpc]
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+# End LIBRARY swig_dcerpc
+#######################
diff --git a/source4/scripting/swig/config.mk b/source4/scripting/swig/config.mk
deleted file mode 100644
index 38144fb9e2..0000000000
--- a/source4/scripting/swig/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-[LIBRARY::swig_tdb]
-REQUIRED_SUBSYSTEMS = LIBTDB
-
-[LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA