X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=9c40491b9b34618b5cefbfc97943d8a03cafe60a;hb=e9255f8d651e4c09d7f455ad8b51835f6fa204bf;hp=7e3fe8cbc1829d4cd99a1aa8ddbe7f63b1343e7c;hpb=cc46c62ae1e3a9ae107e7953989e91174cece245;p=mod_auth_kerb.cvs%2F.git

diff --git a/Makefile.in b/Makefile.in
index 7e3fe8c..9c40491 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,33 +4,42 @@ 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
+CPPFLAGS = -I. -Ispnegokrb5 $(KRB5_CPPFLAGS) $(KRB4_CPPFLAGS) $(DEFS)
+LDFLAGS = $(KRB5_LDFLAGS) $(KRB4_LDFLAGS) $(LIB_resolv)
+CFLAGS =
 
-all: modauthkerb
+# 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'}
 
-libspnegokrb5:
-	(cd spnegokrb5 && make)
+all: src/mod_auth_kerb.so
 
-modauthkerb: libspnegokrb5
-	$(APXS) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c
+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)
 
-install: $(TARGET)
-	$(APXS) -i src/mod_auth_kerb.so
+install:
+	$(APXS) -c -i $(APXS_CPPFLAGS) $(APXS_CFLAGS) $(APXS_LDFLAGS) src/mod_auth_kerb.c $(SPNEGO_SRCS)
 
 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