X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=36f604640462e8a5a587c30356f777777c6fa6a8;hb=7c92ff8cae4ec80da12dec0304b4fcef3fc30e14;hp=b85fc3b183667149dd4648603a360480daa5e400;hpb=f67ba8e46937045e2d493ebce3232a3b065e2d35;p=mod_auth_kerb.cvs%2F.git

diff --git a/Makefile.in b/Makefile.in
index b85fc3b..36f6046 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,35 +4,35 @@ KRB5_LDFLAGS = @KRB5_LDFLAGS@
 KRB4_CPPFLAGS = @KRB4_CPPFLAGS@
 KRB4_LDFLAGS = @KRB4_LDFLAGS@
 LIB_resolv = @LIB_resolv@
-DO_KRB5 = @DO_KRB5@
+SPNEGO_SRCS = @SPNEGO_SRCS@
 
-CPPFLAGS = $(KRB5_CPPFLAGS) $(KRB4_CPPFLAGS) $(DEFS) -I. -Ispnegokrb5
-ifdef DO_KRB5
-	LDFLAGS = -Lspnegokrb5 -lspnegokrb5 $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv)
-else
-	LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv)
-endif
-CFLAGS = -Wc-g
-
-.PHONY: all install clean distclean
+CPPFLAGS = -I. -Ispnegokrb5 $(KRB5_CPPFLAGS) $(KRB4_CPPFLAGS) $(DEFS)
+LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv)
+CFLAGS =
 
 all: src/mod_auth_kerb.so
 
-spnegokrb5/libspnegokrb5.a:
-	(cd spnegokrb5 && make)
-
-src/mod_auth_kerb.so: spnegokrb5/libspnegokrb5.a src/mod_auth_kerb.c
-	$(APXS) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c
+src/mod_auth_kerb.so: src/mod_auth_kerb.c $(SPNEGO_SRCS)
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c" "src/mod_auth_kerb.c"
 
 install:
-	$(APXS) -c -i $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c
+	./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SPNEGO_SRCS}" "${APXS}" "-c -i" "src/mod_auth_kerb.c"
 
 clean:
-	(cd spnegokrb5 && make clean)
-	$(RM) *.o *.so *.a *.la *.lo *.slo core
-	$(RM) src/*.{o,so,a,la,lo,slo}
+	for i in . src spnegokrb5; do \
+		$(RM) $$i/*.{o,so,a,la,lo,slo} core; \
+		$(RM) -rf $$i/.libs; \
+	done
 
 distclean: clean
-	(cd spnegokrb5 && make distclean)
-	$(RM) config.h config.status Makefile configure config.log
-	$(RM) -rf autom4te.cache src/.libs
+	$(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