diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-19 19:47:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:58:49 -0500 |
| commit | 184955ffd711a5db8b1e1b7c179c232ce0e29145 (patch) | |
| tree | 5321ac3a189f98de5a3309b3be7c45968289c5a3 /source4/lib | |
| parent | c06acda7d5b78bfd5c098477b1ca9d949092e281 (diff) | |
| download | samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.gz samba-184955ffd711a5db8b1e1b7c179c232ce0e29145.tar.bz2 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/lib')
| -rw-r--r-- | source4/lib/com/config.mk | 8 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 10 | ||||
| -rw-r--r-- | source4/lib/tdr/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/util/config.mk | 4 |
5 files changed, 15 insertions, 11 deletions
diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index f0c13886d0..de6d598159 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,11 +1,15 @@ -[SUBSYSTEM::com] +[LIBRARY::com] +VERSION = 0.0.1 +SO_VERSION = 0 PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = \ tables.o \ rot.o \ main.o -[SUBSYSTEM::dcom] +[LIBRARY::dcom] +VERSION = 0.0.1 +SO_VERSION = 0 PRIVATE_PROTO_HEADER = dcom/proto.h OBJ_FILES = \ dcom/main.o \ diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 19ea9f6580..661c31d027 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -170,7 +170,7 @@ OBJ_FILES = \ [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ tools/cmdline.o -REQUIRED_SUBSYSTEMS = ldb LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS +REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS # End SUBSYSTEM LIBLDB_CMDLINE ################################################ diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 13700939cb..fe80c62af4 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -92,7 +92,7 @@ OBJ_FILES = \ reg_samba.o \ patchfile.o REQUIRED_SUBSYSTEMS = \ - LIBBASIC + LIBSAMBA-UTIL PRIVATE_PROTO_HEADER = registry_proto.h PUBLIC_HEADERS = registry.h # End MODULE registry_ldb @@ -105,7 +105,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regdiff.o REQUIRED_SUBSYSTEMS = \ - CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regdiff.1 # End BINARY regdiff ################################################ @@ -117,7 +117,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regpatch.o REQUIRED_SUBSYSTEMS = \ - CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regpatch.1 # End BINARY regpatch ################################################ @@ -129,7 +129,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regshell.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE + LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE MANPAGE = man/regshell.1 # End BINARY regshell ################################################ @@ -141,7 +141,7 @@ INSTALLDIR = BINDIR OBJ_FILES= \ tools/regtree.o REQUIRED_SUBSYSTEMS = \ - CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS + LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk index a55315c522..115f8f8726 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -4,5 +4,5 @@ VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h -REQUIRED_SUBSYSTEMS = LIBTALLOC LIBBASIC +REQUIRED_SUBSYSTEMS = LIBTALLOC LIBSAMBA-UTIL OBJ_FILES = tdr.o diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index a0eabaaf31..5aac291152 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -1,4 +1,4 @@ -[LIBRARY::LIBBASIC] +[LIBRARY::LIBSAMBA-UTIL] VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = Generic utility functions @@ -33,7 +33,7 @@ OBJ_FILES = xfile.o \ module.o REQUIRED_SUBSYSTEMS = \ CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \ - SOCKET_WRAPPER CONFIG \ + SOCKET_WRAPPER LIBSAMBA-CONFIG \ # for the base64 functions ldb |