From: kouril <kouril>
Date: Mon, 28 Mar 2011 20:12:22 +0000 (+0000)
Subject: Improved building
X-Git-Tag: gssweb-apache-2014-09-08~29
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mod_auth_kerb.cvs%2F.git;a=commitdiff_plain;h=61e0ba1179c49c1876b81bc3eec362268b55a9d5

Improved building
---

diff --git a/Makefile.in b/Makefile.in
index 492a4bd..2020782 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,13 +7,15 @@ CPPFLAGS = -I. -Ispnegokrb5 $(GSS_CPPFLAGS) $(DEFS)
 LDFLAGS = $(GSS_LDFLAGS)
 CFLAGS =
 
+SRCS = mod_auth_gssapi.c gss.c $(SPNEGO_SRCS)
+
 all: mod_auth_gssapi.la
 
-mod_auth_gssapi.la: mod_auth_gssapi.c $(SPNEGO_SRCS)
-	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS} -c"
+mod_auth_gssapi.la: $(SRCS)
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SRCS}" "${APXS} -c"
 
-install:
-	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS} -c -i -n auth_gssapi"
+install: mod_auth_gssapi.la
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" $^ "${APXS} -i -A -n auth_gssapi"
 
 clean:
 	for i in . spnegokrb5; do \
diff --git a/apxs.sh b/apxs.sh
index 9dd608f..db8c74b 100755
--- a/apxs.sh
+++ b/apxs.sh
@@ -4,5 +4,5 @@
 #
 cppflags=`[ -n "$1" ] && echo $1 | sed -e 's/\([^ ]\+\)/-Wc,\1/g'`
 ldflags=`[ -n "$2"  ] && echo $2 | sed -e 's/\([^ ]\+\)/-Wl,\1/g'`
-ret=eval $4 $cppflags $ldflags mod_auth_gssapi.c $3
+ret=eval $4 $cppflags $ldflags $3
 exit $ret