Mass makefile/configure.in build system revamp

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10424 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 61 insertions, 51 deletions

diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 1aad2af77..de21f3867 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,11 @@
+Mon Feb  2 16:47:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
+	* configure.in: Create the makefiles for all of the subdirectories
+		and move all of the configure.in tests from the
+		subdirectories into this configure.in.
+	
 Wed Jan 21 19:12:42 1998  Tom Yu  <tlyu@mit.edu>
 
 	* Makefile.in (LIBMINOR): Bump minor version due to internal
diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in
index c4e311083..92129e0b7 100644
--- a/src/lib/gssapi/Makefile.in
+++ b/src/lib/gssapi/Makefile.in
@@ -1,4 +1,7 @@
-##DOSBUILDTOP = ..\..
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS= generic krb5
+
 ##DOSLIBNAME=gssapi.lib
 ##DOSOBJFILELIST=@generic.lst @krb5.lst
 ##DOSOBJFILEDEP=generic.lst krb5.lst
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index c0fba38b5..2de487194 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -1,11 +1,20 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(generic krb5)
-dnl CONFIG_DIRS(generic krb5 mechglue)
+dnl AC_CONFIG_SUBDIRS(generic krb5)
+dnl AC_CONFIG_SUBDIRS(generic krb5 mechglue)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
+AC_PROG_AWK
 AC_PROG_INSTALL
-DO_SUBDIRS
+AC_PROG_RANLIB
+AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h)
+AC_SIZE_T
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
-V5_AC_OUTPUT_MAKEFILE
+K5_GEN_MAKEFILE(., lib)
+K5_GEN_MAKEFILE(generic, libobj)
+K5_GEN_MAKEFILE(krb5, libobj)
+K5_OUTPUT_FILES
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index 3e9021a04..14842021b 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Fri Jun 27 08:44:54 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* gssapi.hin: Add definition of GSS_C_NO_NAME (per
diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in
index dbe0f8b67..feb41ff66 100644
--- a/src/lib/gssapi/generic/Makefile.in
+++ b/src/lib/gssapi/generic/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOS##BUILDTOP = ..\..\..
diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in
deleted file mode 100644
index f879d41f0..000000000
--- a/src/lib/gssapi/generic/configure.in
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_INSTALL
-AC_PROG_AWK
-AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h)
-AC_SIZE_T
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 1626ec2cf..899ac007a 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,12 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
+Wed Jan 28 16:57:05 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* configure.in, Makefile.in: Remove use of CopySrcHeader from
+		configure.in and move functionality to Makefile.in
+
 Thu Feb  5 22:39:44 1998  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix bug where if
diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in
index 2a16c7e4d..083529a55 100644
--- a/src/lib/gssapi/krb5/Makefile.in
+++ b/src/lib/gssapi/krb5/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./../
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic
 
 ##DOS##BUILDTOP = ..\..\..
@@ -159,6 +161,18 @@ all-windows:: win-include $(SRCS) $(HDRS)
 all-unix:: $(SRCS) $(HDRS) includes
 all-unix:: all-libobjs
 
+includes:: gssapi_krb5.h
+	if cmp $(srcdir)/gssapi_krb5.h \
+	$(BUILDTOP)/include/gssapi/gssapi_krb5.h >/dev/null 2>&1; then :; \
+	else \
+		(set -x; $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h; \
+		 $(CP) $(srcdir)/gssapi_krb5.h \
+			$(BUILDTOP)/include/gssapi/gssapi_krb5.h) ; \
+	fi
+
+clean-unix::
+	$(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h
+
 win-include::
 	if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR)
 	copy gssapi_krb5.h $(EHDRDIR)
diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in
deleted file mode 100644
index 8de9aa66f..000000000
--- a/src/lib/gssapi/krb5/configure.in
+++ /dev/null
@@ -1,8 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_AWK
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(stdlib.h)
-KRB5_BUILD_LIBOBJS
-CopySrcHeader(gssapi_krb5.h,[$](BUILDTOP)/include/gssapi)
-V5_AC_OUTPUT_MAKEFILE
diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog
index 35c48afca..b0f08da62 100644
--- a/src/lib/gssapi/mechglue/ChangeLog
+++ b/src/lib/gssapi/mechglue/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
+
 Wed Feb  5 10:37:00 1996  Richard Basch  <basch@lehman.com>
 
 	* g_accept_sec_context.c g_acquire_cred.c g_compare_name.c
diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in
index ae86a4fa7..33faf8910 100644
--- a/src/lib/gssapi/mechglue/Makefile.in
+++ b/src/lib/gssapi/mechglue/Makefile.in
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir)
 
 ##DOSBUILDTOP = ..\..\..
diff --git a/src/lib/gssapi/mechglue/configure.in b/src/lib/gssapi/mechglue/configure.in
deleted file mode 100644
index bd9b4db21..000000000
--- a/src/lib/gssapi/mechglue/configure.in
+++ /dev/null
@@ -1,26 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-AC_PROG_ARCHIVE
-AC_PROG_ARCHIVE_ADD
-AC_PROG_RANLIB
-AC_PROG_INSTALL
-AC_CHECK_HEADERS(stdlib.h)
-V5_SHARED_LIB_OBJS
-SubdirLibraryRule([${OBJS}])
-CopySrcHeader(mechglue.h,[$(EHDRDIR)])
-AC_CANONICAL_HOST
-case $host in
-     *-*-aix*) # don't build libgssapi.a on AIX
-       ;;
-     *)
-       V5_MAKE_SHARED_LIB(libgssapi,1.0,.., ./mechglue)
-       AppendRule([install:: libgssapi.[$](LIBEXT)
-	       [$](INSTALL_DATA) libgssapi.[$](LIBEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libgssapi.[$](LIBEXT)])
-       LinkFileDir([$](TOPLIBD)/libgssapi.[$](LIBEXT),libgssapi.[$](LIBEXT),./gssapi/mechglue)
-       AppendRule([all:: [$](TOPLIBD)/libgssapi.[$](LIBEXT)])
-
-      ;;
-esac
-
-V5_AC_OUTPUT_MAKEFILE
-