Removed recursively called make; all objects required are set by the configure

script. This change should make it possible to use non-GNU make's.

diff --git a/Makefile.in b/Makefile.in
index 9f4d983..dca9a12 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,35 +4,26 @@ 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
+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 $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c
+src/mod_auth_kerb.so: src/mod_auth_kerb.c $(SPNEGO_SRCS)
+       $(APXS) -c $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c $(SPNEGO_SRCS)
 
 install:
-       $(APXS) -c -i $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) src/mod_auth_kerb.c
+       $(APXS) -c -i $(CPPFLAGS) $(CFLAGS) $(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}
 
 distclean: clean
-       (cd spnegokrb5 && make distclean)
        $(RM) config.h config.status Makefile configure config.log
        $(RM) -rf autom4te.cache src/.libs
+
+.PHONY: all install clean distclean

diff --git a/configure.in b/configure.in
index f16a345..a0aafd4 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,7 +35,7 @@ AC_STRUCT_TM
 KRB5_CPPFLAGS=""
 KRB5_LDFLAGS=""
 krb5_config_command=krb5-config
-DO_KRB5=
+SPNEGO_SRCS=""
 
 AC_ARG_WITH(krb5,
   AC_HELP_STRING([--with-krb5=dir],[use krb5 in dir]),
@@ -92,12 +92,28 @@ if test "x$with_krb5" != "xno" ; then
      LDFLAGS=$ac_save_LDFLAGS
      LIBS=$ac_save_LIBS
      AC_DEFINE(KRB5)
-     DO_KRB5=yes
+     SPNEGO_SRCS="\
+       spnegokrb5/asn1_MechType.c         \
+        spnegokrb5/asn1_MechTypeList.c     \
+        spnegokrb5/asn1_ContextFlags.c     \
+        spnegokrb5/asn1_NegTokenInit.c     \
+        spnegokrb5/asn1_NegTokenTarg.c     \
+        spnegokrb5/der_get.c               \
+        spnegokrb5/der_put.c               \
+        spnegokrb5/der_free.c              \
+        spnegokrb5/der_length.c            \
+        spnegokrb5/der_copy.c              \
+        spnegokrb5/timegm.c                \
+        spnegokrb5/init_sec_context.c      \
+        spnegokrb5/accept_sec_context.c    \
+        spnegokrb5/encapsulate.c           \
+        spnegokrb5/decapsulate.c           \
+        spnegokrb5/external.c"
   fi
 fi
 AC_SUBST(KRB5_CPPFLAGS)
 AC_SUBST(KRB5_LDFLAGS)
-AC_SUBST(DO_KRB5)
+AC_SUBST(SPNEGO_SRCS)
 
 #
 # Kerberos4 enviroment
@@ -223,7 +239,6 @@ AC_MSG_RESULT(yes)
 
 AC_SUBST(APXS)
 
-AC_CONFIG_FILES([Makefile
-                 spnegokrb5/Makefile])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT

diff --git a/spnegokrb5/Makefile.in b/spnegokrb5/Makefile.in
deleted file mode 100644 (file)
index 5349f77..0000000
--- a/spnegokrb5/Makefile.in
+++ /dev/null
@@ -1,48 +0,0 @@
-KRB5_CPPFLAGS = @KRB5_CPPFLAGS@
-KRB5_LDFLAGS = @KRB5_LDFLAGS@
-DO_KRB5 = @DO_KRB5@
-
-CPPFLAGS = -I. -I.. $(KRB5_CPPFLAGS)
-CFLAGS = -Wall -g
-
-ifdef DO_KRB5
-       TARGET=libspnegokrb5.a
-else
-       TARGET=
-endif
-
-gen_files =                    \
-       asn1_MechType.c         \
-       asn1_MechTypeList.c     \
-       asn1_ContextFlags.c     \
-       asn1_NegTokenInit.c     \
-       asn1_NegTokenTarg.c
-
-asn1_files =                   \
-       der_get.c               \
-       der_put.c               \
-       der_free.c              \
-       der_length.c            \
-       der_copy.c              \
-       timegm.c
-
-spnegokrb5_files =             \
-       init_sec_context.c      \
-       accept_sec_context.c    \
-       encapsulate.c           \
-       decapsulate.c           \
-       external.c
-
-all: $(TARGET)
-
-libspnegokrb5.a: $(gen_files:.c=.o) $(asn1_files:.c=.o) $(spnegokrb5_files:.c=.o)
-       ar -rscu libspnegokrb5.a $^
-
-test:
-       $(CC) -g -o test -I/usr/heimdal-0.6/include test.c libspnegokrb5.a -L/usr/heimdal-0.6/lib -lgssapi
-       
-clean:
-       $(RM) *.o core libspnegokrb5.a
-
-distclean: clean
-       $(RM) Makefile