diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-21 22:01:32 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-21 22:01:32 +1100 |
| commit | 24efc9fc36194d379838eb9911b65e93535da19b (patch) | |
| tree | fa08fcbf21143655eb85ba79c6169b3b2eb24fdd /source4/lib | |
| parent | 8623c981b4a67dafc19234faffced1796f33b975 (diff) | |
| parent | 440b1a1d04bca3027100b3bda84738730ffce71c (diff) | |
| download | samba-24efc9fc36194d379838eb9911b65e93535da19b.tar.gz samba-24efc9fc36194d379838eb9911b65e93535da19b.tar.bz2 samba-24efc9fc36194d379838eb9911b65e93535da19b.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit b99b604a5f8b7eb98a6285145188c0b94946df78)
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/ldb/python.mk | 5 | ||||
| -rw-r--r-- | source4/lib/nss_wrapper/config.mk | 5 | ||||
| -rw-r--r-- | source4/lib/policy/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/samba3/config.mk | 5 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/config.mk | 5 | ||||
| -rw-r--r-- | source4/lib/tdr/config.mk | 5 |
6 files changed, 6 insertions, 21 deletions
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk index f81c2e3e16..bbd4c1c5eb 100644 --- a/source4/lib/ldb/python.mk +++ b/source4/lib/ldb/python.mk @@ -1,7 +1,4 @@ -####################### -# Start LIBRARY swig_ldb [PYTHON::swig_ldb] PUBLIC_DEPENDENCIES = LIBLDB +CFLAGS = -Ilib/ldb/include SWIG_FILE = ldb.i -# End LIBRARY swig_ldb -####################### diff --git a/source4/lib/nss_wrapper/config.mk b/source4/lib/nss_wrapper/config.mk index 9751d2bf73..b46f7c3ee7 100644 --- a/source4/lib/nss_wrapper/config.mk +++ b/source4/lib/nss_wrapper/config.mk @@ -1,9 +1,6 @@ ############################## # Start SUBSYSTEM NSS_WRAPPER -[LIBRARY::NSS_WRAPPER] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Wrapper library for testing nss calls without being root +[SUBSYSTEM::NSS_WRAPPER] PUBLIC_HEADERS = nss_wrapper.h OBJ_FILES = nss_wrapper.o # End SUBSYSTEM NSS_WRAPPER diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk index f404d58377..aae98b86b2 100644 --- a/source4/lib/policy/config.mk +++ b/source4/lib/policy/config.mk @@ -1,4 +1,4 @@ -[LIBRARY::LIBPOLICY] +[SUBSYSTEM::LIBPOLICY] CFLAGS = -Iheimdal/lib/roken OBJ_FILES = lex.o parse_adm.o PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index 76f1ce5096..705bdd4002 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -1,9 +1,6 @@ ################################################ # Start SUBSYSTEM LIBSAMBA3 -[LIBRARY::LIBSAMBA3] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Library for reading Samba3 data files +[SUBSYSTEM::LIBSAMBA3] PRIVATE_PROTO_HEADER = samba3_proto.h PUBLIC_HEADERS = samba3.h OBJ_FILES = tdbsam.o policy.o \ diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk index 9e194230dc..4c5cf94348 100644 --- a/source4/lib/socket_wrapper/config.mk +++ b/source4/lib/socket_wrapper/config.mk @@ -1,9 +1,6 @@ ############################## # Start SUBSYSTEM SOCKET_WRAPPER -[LIBRARY::SOCKET_WRAPPER] -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets +[SUBSYSTEM::SOCKET_WRAPPER] PUBLIC_HEADERS = socket_wrapper.h OBJ_FILES = socket_wrapper.o PRIVATE_DEPENDENCIES = EXT_SOCKET diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk index f0e24c54b4..b8473e5ba8 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -1,9 +1,6 @@ -[LIBRARY::TDR] +[SUBSYSTEM::TDR] CFLAGS = -Ilib/tdr PUBLIC_HEADERS = tdr.h -VERSION = 0.0.1 -SO_VERSION = 0 -DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL OBJ_FILES = tdr.o |