X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=e9005d82486f3e9b132399cd37dea3bbae01893c;hb=5e863ddff6ef99a59acfb3c41f0b86ebc1468be7;hp=9c40491b9b34618b5cefbfc97943d8a03cafe60a;hpb=0ebaf0fa8d361f9425958f5d78390a1fee14f025;p=mod_auth_kerb.git

diff --git a/Makefile.in b/Makefile.in
index 9c40491..e9005d8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,33 +1,23 @@
 APXS = @APXS@
-KRB5_CPPFLAGS = @KRB5_CPPFLAGS@
-KRB5_LDFLAGS = @KRB5_LDFLAGS@
-KRB4_CPPFLAGS = @KRB4_CPPFLAGS@
-KRB4_LDFLAGS = @KRB4_LDFLAGS@
-LIB_resolv = @LIB_resolv@
+GSS_CPPFLAGS = @GSS_CPPFLAGS@
+GSS_LDFLAGS = @GSS_LDFLAGS@
 SPNEGO_SRCS = @SPNEGO_SRCS@
 
-CPPFLAGS = -I. -Ispnegokrb5 $(KRB5_CPPFLAGS) $(KRB4_CPPFLAGS) $(DEFS)
-LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv)
+CPPFLAGS = -I. -Ispnegokrb5 $(GSS_CPPFLAGS) $(DEFS)
+LDFLAGS = $(GSS_LDFLAGS)
 CFLAGS =
 
-# Use these assignements instead of the default ones if your're building on BSD
-# systems. A 'if' statemet would be better, of course.
-#APXS_CPPFLAGS != [ -n "${CPPFLAGS}" ] && echo ${CPPFLAGS} | sed -e 's/\([^ ]*\)/-Wc,\1/g'
-#APXS_LDFLAGS  != [ -n "${LDFLAGS}"  ] && echo ${LDFLAGS} | sed -e 's/\([^ ]*\)/-Wl,\1/g'
-APXS_CPPFLAGS = ${shell [ -n "${CPPFLAGS}" ] && echo ${CPPFLAGS} | sed -e 's/\([^ ]*\)/-Wc,\1/g'}
-APXS_LDFLAGS  = ${shell [ -n "${LDFLAGS}"  ] && echo ${LDFLAGS} | sed -e 's/\([^ ]*\)/-Wl,\1/g'}
+all: mod_auth_gssapi.la
 
-all: src/mod_auth_kerb.so
-
-src/mod_auth_kerb.so: src/mod_auth_kerb.c $(SPNEGO_SRCS)
-	$(APXS) -c $(APXS_CPPFLAGS) $(APXS_CFLAGS) $(APXS_LDFLAGS) src/mod_auth_kerb.c $(SPNEGO_SRCS)
+mod_auth_gssapi.la: mod_auth_gssapi.c $(SPNEGO_SRCS)
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS} -c"
 
 install:
-	$(APXS) -c -i $(APXS_CPPFLAGS) $(APXS_CFLAGS) $(APXS_LDFLAGS) src/mod_auth_kerb.c $(SPNEGO_SRCS)
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS} -c -i -n auth_gssapi"
 
 clean:
-	for i in . src spnegokrb5; do \
-		$(RM) $$i/*.{o,so,a,la,lo,slo} core; \
+	for i in . spnegokrb5; do \
+		(cd $$i && $(RM) *.o *.so *.a *.la *.lo *.slo); \
 		$(RM) -rf $$i/.libs; \
 	done
 
@@ -35,11 +25,4 @@ distclean: clean
 	$(RM) config.h config.status Makefile config.log
 	$(RM) -rf autom4te.cache
 
-make_release:
-	echo "Did you increase version numbers?"
-	autoconf
-	$(RM) -rf autom4te.cache
-	$(RM) -rf .cvsignore spnegokrb5/.cvsignore src/.cvsignore
-	$(RM) -rf CVS spnegokrb5/CVS src/CVS
-
 .PHONY: all install clean distclean