diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-26 18:03:50 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:45 -0500 |
commit | d8e35f882879e189f55b3bca818dd44cc5f0c6fa (patch) | |
tree | e9a9696ef8406b06cdaa2dee0dfcc2d01d594d76 /source4/libcli | |
parent | 448483199fb436309735f5203b3282fca2c517ec (diff) | |
download | samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.gz samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.bz2 samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.zip |
r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using
the difference between these at all, and in the future the
fact that INIT_OBJ_FILES include smb_build.h will be sufficient to
have recompiles at the right time.
(This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def)
Diffstat (limited to 'source4/libcli')
-rw-r--r-- | source4/libcli/auth/config.mk | 2 | ||||
-rw-r--r-- | source4/libcli/config.m4 | 2 | ||||
-rw-r--r-- | source4/libcli/config.mk | 20 | ||||
-rw-r--r-- | source4/libcli/ldap/config.mk | 2 | ||||
-rw-r--r-- | source4/libcli/security/config.mk | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source4/libcli/auth/config.mk b/source4/libcli/auth/config.mk index c97bcd1e73..51d16d8231 100644 --- a/source4/libcli/auth/config.mk +++ b/source4/libcli/auth/config.mk @@ -1,7 +1,7 @@ ################################# # Start SUBSYSTEM LIBCLI_AUTH [SUBSYSTEM::LIBCLI_AUTH] -ADD_OBJ_FILES = credentials.o \ +OBJ_FILES = credentials.o \ session.o \ smbencrypt.o REQUIRED_SUBSYSTEMS = \ diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4 index 6e0a88ec35..feb9e79d38 100644 --- a/source4/libcli/config.m4 +++ b/source4/libcli/config.m4 @@ -5,4 +5,4 @@ if test x"$with_ads_support" = x"yes"; then LIBCLI_RAW_LIBS="KRB5" fi -SMB_SUBSYSTEM(LIBCLI_RAW_KRB5,[], [], [${LIBCLI_RAW_LIBS}]) +SMB_SUBSYSTEM(LIBCLI_RAW_KRB5, [], [${LIBCLI_RAW_LIBS}]) diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index 782dac2dd7..f76a396852 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -3,7 +3,7 @@ include ldap/config.mk include security/config.mk [SUBSYSTEM::LIBCLI_UTILS] -ADD_OBJ_FILES = util/asn1.o \ +OBJ_FILES = util/asn1.o \ util/doserr.o \ util/errormap.o \ util/clierror.o \ @@ -11,16 +11,16 @@ ADD_OBJ_FILES = util/asn1.o \ util/smbdes.o [SUBSYSTEM::LIBCLI_LSA] -ADD_OBJ_FILES = util/clilsa.o +OBJ_FILES = util/clilsa.o REQUIRED_SUBSYSTEMS = RPC_NDR_LSA [SUBSYSTEM::LIBCLI_COMPOSITE] -ADD_OBJ_FILES = \ +OBJ_FILES = \ composite/composite.o REQUIRED_SUBSYSTEMS = LIBEVENTS [SUBSYSTEM::LIBCLI_SMB_COMPOSITE] -ADD_OBJ_FILES = \ +OBJ_FILES = \ smb_composite/loadfile.o \ smb_composite/savefile.o \ smb_composite/connect.o \ @@ -35,7 +35,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 DESCRIPTION = NetBios over TCP/IP client library -ADD_OBJ_FILES = \ +OBJ_FILES = \ nbt/nbtname.o \ nbt/nbtsocket.o \ nbt/namequery.o \ @@ -46,7 +46,7 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT SOCKET LIBCLI_COMPOSITE LIBEVENTS \ LIB_SECURITY_NDR [SUBSYSTEM::LIBCLI_DGRAM] -ADD_OBJ_FILES = \ +OBJ_FILES = \ dgram/dgramsocket.o \ dgram/mailslot.o \ dgram/netlogon.o \ @@ -60,7 +60,7 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 DESCRIPTION = CLDAP client library -ADD_OBJ_FILES = cldap/cldap.o +OBJ_FILES = cldap/cldap.o PUBLIC_HEADERS = cldap/cldap.h NOPROTO=YES REQUIRED_SUBSYSTEMS = LIBCLI_LDAP @@ -70,12 +70,12 @@ MAJOR_VERSION = 0 MINOR_VERSION = 0 RELEASE_VERSION = 1 DESCRIPTION = WINS Replication client library -ADD_OBJ_FILES = \ +OBJ_FILES = \ wrepl/winsrepl.o REQUIRED_SUBSYSTEMS = NDR_WINSREPL SOCKET LIBEVENTS [SUBSYSTEM::LIBCLI_RESOLVE] -ADD_OBJ_FILES = \ +OBJ_FILES = \ resolve/resolve.o \ resolve/nbtlist.o \ resolve/bcast.o \ @@ -94,7 +94,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \ [SUBSYSTEM::LIBSMB] REQUIRED_SUBSYSTEMS = LIBCLI SOCKET -ADD_OBJ_FILES = clireadwrite.o \ +OBJ_FILES = clireadwrite.o \ cliconnect.o \ clifile.o \ clilist.o \ diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk index face7caa66..243de79fce 100644 --- a/source4/libcli/ldap/config.mk +++ b/source4/libcli/ldap/config.mk @@ -1,7 +1,7 @@ ################################# # Start SUBSYSTEM LIBCLI_LDAP [SUBSYSTEM::LIBCLI_LDAP] -ADD_OBJ_FILES = ldap.o \ +OBJ_FILES = ldap.o \ ldap_client.o \ ldap_bind.o \ ldap_msg.o \ diff --git a/source4/libcli/security/config.mk b/source4/libcli/security/config.mk index 7faecaf5f2..368a56d2b4 100644 --- a/source4/libcli/security/config.mk +++ b/source4/libcli/security/config.mk @@ -1,14 +1,14 @@ ################################# # Start SUBSYSTEM LIB_SECURITY_NDR_HELPER [SUBSYSTEM::LIB_SECURITY_NDR_HELPER] -ADD_OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o +OBJ_FILES = ../../librpc/ndr/ndr_sec_helper.o # End SUBSYSTEM LIB_SECURITY_NDR_HELPER ################################# ################################# # Start SUBSYSTEM LIB_SECURITY_NDR [SUBSYSTEM::LIB_SECURITY_NDR] -ADD_OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o +OBJ_FILES = ../../librpc/gen_ndr/ndr_security.o NOPROTO = YES REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER # End SUBSYSTEM LIB_SECURITY_NDR @@ -17,7 +17,7 @@ REQUIRED_SUBSYSTEMS = LIB_SECURITY_NDR_HELPER ################################# # Start SUBSYSTEM LIB_SECURITY [SUBSYSTEM::LIB_SECURITY] -ADD_OBJ_FILES = security_token.o \ +OBJ_FILES = security_token.o \ security_descriptor.o \ dom_sid.o \ access_check.o \ |