From: Derrick Brashear <shadow@dementia.org>
Date: Wed, 3 Aug 2011 17:05:27 +0000 (-0400)
Subject: pam: stop building it wrong
X-Git-Tag: upstream/1.8.0_pre1^2~3436
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1fc4c9dbe2b1ba11929a5e5106afda5969e6fa7c;p=packages%2Fo%2Fopenafs.git

pam: stop building it wrong

in the new lwp/pthread/shared universe, well, we have the
opportunity to be correct. and we chose to do it entirely wrong.
we're building a shared object. use the right rules. we need
to add some CFLAGS for PAM. do that using MODULE_CFLAGS instead
of just building a whole new CCRULE

Change-Id: Ie3e3c5ba902e5364cfa99d4dbd1b5b7fd4451127
Reviewed-on: http://gerrit.openafs.org/5153
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/pam/Makefile.in b/src/pam/Makefile.in
index adcdda2ae..8a87b71ee 100644
--- a/src/pam/Makefile.in
+++ b/src/pam/Makefile.in
@@ -7,7 +7,10 @@
 
 srcdir=@srcdir@
 include @TOP_OBJDIR@/src/config/Makefile.config
+include @TOP_OBJDIR@/src/config/Makefile.shared
 
+  OPTMZ = ${PAM_OPTMZ}
+    DBG = ${PAM_DBG}
    LIBS = ${TOP_LIBDIR}/libafsauthent_pic.a ${TOP_LIBDIR}/libafsrpc_pic.a \
 	  ${PAM_LIBS} @LIB_AFSDB@ ${MT_LIBS}
   KLIBS = ktc_krb.o ${TOP_LIBDIR}/libafsauthent_pic.a \
@@ -16,12 +19,9 @@ include @TOP_OBJDIR@/src/config/Makefile.config
  SHOBJS = afs_account.o afs_session.o afs_password.o \
 	  afs_pam_msg.o afs_message.o AFS_component_version_number.o
    OBJS = $(SHOBJS) test_pam.o
-INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} 
 
 
-AFS_CCRULE= $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$(@)) \
-	        ${PAM_DBG} ${PAM_OPTMZ} \
-		${INCLUDES} ${PAM_CFLAGS} -c -o $@
+MODULE_CFLAGS=${PAM_CFLAGS}
 
 .c.o:
 	$(AFS_CCRULE) $<