summaryrefslogtreecommitdiffstats
path: root/source4/scripting
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-19 19:47:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:58:49 -0500
commit184955ffd711a5db8b1e1b7c179c232ce0e29145 (patch)
tree5321ac3a189f98de5a3309b3be7c45968289c5a3 /source4/scripting
parentc06acda7d5b78bfd5c098477b1ca9d949092e281 (diff)
downloadsamba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.gz
samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.xz
samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.zip
r14572: Give libraries saner names, remove some .pc files, make some things
subsystems in case a library doesn't make sense. (This used to be commit ed382873fd01457a53e0a1e1f5ba6753dfbc0646)
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/config.mk2
-rw-r--r--source4/scripting/ejs/config.mk6
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/config.mk b/source4/scripting/config.mk
index 22437909ed7..c1696805077 100644
--- a/source4/scripting/config.mk
+++ b/source4/scripting/config.mk
@@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = ldb
#######################
# Start LIBRARY swig_dcerpc
[LIBRARY::swig_dcerpc]
-REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBBASIC CONFIG RPC_NDR_SAMR RPC_NDR_LSA
+REQUIRED_SUBSYSTEMS = LIBCLI NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG RPC_NDR_SAMR RPC_NDR_LSA
# End LIBRARY swig_dcerpc
#######################
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index ffda803f47a..e5a20d20e1d 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -73,9 +73,9 @@ OBJ_FILES = \
ejsnet.o \
mprutil.o
REQUIRED_SUBSYSTEMS = \
- EJS LIBBASIC \
+ EJS LIBSAMBA-UTIL \
EJSRPC MESSAGING \
- LIBNET LIBSMB LIBPOPT \
+ LIBSAMBA-NET LIBSMB LIBPOPT \
POPT_CREDENTIALS POPT_SAMBA \
dcerpc \
NDR_TABLE
@@ -88,6 +88,6 @@ REQUIRED_SUBSYSTEMS = \
INSTALLDIR = BINDIR
OBJ_FILES = \
smbscript.o
-REQUIRED_SUBSYSTEMS = EJS LIBBASIC smbcalls CONFIG
+REQUIRED_SUBSYSTEMS = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
# End BINARY SMBSCRIPT
#######################