diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-05-01 22:07:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:30 -0500 |
| commit | 46f627ea7afb0ad006efadf593bf202cea05194e (patch) | |
| tree | 2e92592f7e386d35a2f41d0daa6fcba188dd8202 /source4/libcli | |
| parent | 07440b79e86fb23248b59a5abcc88a1d090f32ee (diff) | |
| download | samba-46f627ea7afb0ad006efadf593bf202cea05194e.tar.gz samba-46f627ea7afb0ad006efadf593bf202cea05194e.tar.bz2 samba-46f627ea7afb0ad006efadf593bf202cea05194e.zip | |
r15384: Improve naming of socket library, disable Requires(.private)? fields in pkg-config files for now as
they break external projects.
(This used to be commit f919fd6655f00361691e676d260bd40e0b8ddcc7)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/config.mk | 8 | ||||
| -rw-r--r-- | source4/libcli/ldap/config.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 0e680215d3..f3e9be7f63 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -54,7 +54,7 @@ OBJ_FILES = \ nbt/namerefresh.o \ nbt/namerelease.o PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \ - NDR_SECURITY LIBSAMBA-SOCKET + NDR_SECURITY samba-socket [SUBSYSTEM::LIBCLI_DGRAM] OBJ_FILES = \ @@ -80,7 +80,7 @@ SO_VERSION = 0 DESCRIPTION = WINS Replication client library OBJ_FILES = \ wrepl/winsrepl.o -PUBLIC_DEPENDENCIES = NDR_WINSREPL LIBSAMBA-SOCKET LIBCLI_RESOLVE LIBEVENTS +PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS [SUBSYSTEM::LIBCLI_RESOLVE] PRIVATE_PROTO_HEADER = resolve/proto.h @@ -114,12 +114,12 @@ OBJ_FILES = clireadwrite.o \ clideltree.o PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \ LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \ - LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS LIBSAMBA-SOCKET + LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket [SUBSYSTEM::LIBCLI_RAW] PRIVATE_PROTO_HEADER = raw/raw_proto.h PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE -PUBLIC_DEPENDENCIES = LIBSAMBA-SOCKET LIBPACKET gensec LIBCRYPTO +PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO LDFLAGS = $(SUBSYSTEM_LIBCLI_SMB_COMPOSITE_OUTPUT) OBJ_FILES = raw/rawfile.o \ raw/smb_signing.o \ diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk index c1c74cd168..88ebc3256f 100644 --- a/source4/libcli/ldap/config.mk +++ b/source4/libcli/ldap/config.mk @@ -11,7 +11,7 @@ OBJ_FILES = ldap.o \ ldap_ildap.o \ ldap_controls.o PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS LIBPACKET -PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LIBSAMBA-SOCKET LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL +PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket LIBCLI_RESOLVE NDR_SAMR LIBTLS ASN1_UTIL #PRIVATE_DEPENDENCIES = gensec # End SUBSYSTEM LIBCLI_LDAP ################################# |