From e9017ba418202b4b191c5a9ad4a96857558ce606 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 14 Apr 2008 17:22:58 +0200
Subject: Use _OBJ_FILES variables in a couple more places. (This used to be
 commit 92856d5054106894b65cd1a1b5119c0facfc4cff)

---
 source4/auth/config.mk        |  4 ++--
 source4/auth/gensec/config.mk | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'source4/auth')

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index de8926d2af2..780c098b68a 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -89,13 +89,13 @@ PRIVATE_PROTO_HEADER = pam_errors.h
 #SO_VERSION = 0
 PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
 
-[MODULE::service_auth]
+[MODULE::auth]
 INIT_FUNCTION = server_service_auth_init
 SUBSYSTEM = smbd
 PRIVATE_PROTO_HEADER = auth_proto.h
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
 
-service_auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
+auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
 
 # PUBLIC_HEADERS += auth/auth.h
 
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index e5fb2ef2013..8f1aa9f84d3 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -10,7 +10,7 @@ PUBLIC_DEPENDENCIES = \
 # End SUBSYSTEM gensec
 #################################
 
-gnesec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
+gensec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
 
 PUBLIC_HEADERS += auth/gensec/gensec.h
 
@@ -19,11 +19,11 @@ PUBLIC_HEADERS += auth/gensec/gensec.h
 [MODULE::gensec_krb5]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
-PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
+PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS service_auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
-gensec_krb5_OBJ_FILES = gensec_krb5.o 
+gensec_krb5_OBJ_FILES = $(addprefix auth/gensec/, gensec_krb5.o)
 
 ################################################
 # Start MODULE gensec_gssapi
@@ -34,7 +34,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS
 # End MODULE gensec_gssapi
 ################################################
 
-gensec_gssapi_OBJ_FILES = gensec_gssapi.o 
+gensec_gssapi_OBJ_FILES = $(addprefix auth/gensec/, gensec_gssapi.o)
 
 ################################################
 # Start MODULE cyrus_sasl
@@ -45,7 +45,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS SASL
 # End MODULE cyrus_sasl
 ################################################
 
-cyrus_sasl_OBJ_FILES = auth/gensec/cyrus_sasl.o 
+cyrus_sasl_OBJ_FILES = $(addprefix auth/gensec/, cyrus_sasl.o)
 
 ################################################
 # Start MODULE gensec_spnego
@@ -77,9 +77,8 @@ gensec_schannel_OBJ_FILES = $(addprefix auth/gensec/, schannel.o schannel_sign.o
 [SUBSYSTEM::SCHANNELDB]
 PRIVATE_PROTO_HEADER = schannel_state.h
 PRIVATE_DEPENDENCIES = LDB_WRAP SAMDB
-#
 # End SUBSYSTEM SCHANNELDB
 ################################################
 
-SCHANNELDB_OBJ_FILES = auth/gensec/schannel_state.o
+SCHANNELDB_OBJ_FILES = $(addprefix auth/gensec/, schannel_state.o)
 
-- 
cgit