Instead of arbitrary division of headers into include and include/krb5, with

include directives sometimes using krb5/foo.h and sometimes using foo.h, and
-I options always given for both directories in both source and build trees,
push include/krb5/* up a level and drop the krb5 directory (except, for the
moment, the change log).

Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.

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

1 files changed, 55 insertions, 19 deletions

diff --git a/src/include/Makefile.in b/src/include/Makefile.in
index 15fe54b..e13fca6 100644
--- a/src/include/Makefile.in
+++ b/src/include/Makefile.in
@@ -1,19 +1,14 @@
 thisconfigdir=..
 myfulldir=include
 mydir=include
-LOCAL_SUBDIRS=krb5 @maybe_kerberosIV@
+LOCAL_SUBDIRS=@maybe_kerberosIV@
 BUILDTOP=$(REL)..
+KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 ##DOSBUILDTOP = ..
 NO_OUTPRE=1
 
 all-unix:: krb5.h
 
-all-windows::
-	@echo Making in include\krb5
-	cd krb5
-	$(MAKE) -$(MFLAGS)
-	cd ..
-
 all-unix:: maybe-make-db.h-@DB_HEADER_VERSION@
 
 generate-files-mac: krb5.h
@@ -25,18 +20,58 @@ maybe-make-db.h-sys:
 maybe-make-db.h-redirect:
 	test -r db.h || echo '#include <@DB_HEADER@>' > db.h
 
-all-recurse: krb5/autoconf.h
-krb5/autoconf.h: $(srcdir)/krb5/autoconf.h.in
-	(cd krb5; $(MAKE) autoconf.h)
-$(srcdir)/krb5/autoconf.h.in: @MAINT@ $(srcdir)/krb5/autoconf.stmp
-$(srcdir)/krb5/autoconf.stmp: $(srcdir)/$(thisconfigdir)/configure.in $(SRCTOP)/aclocal.m4
+ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h
+BUILT_HEADERS = osconf.h
+
+all-unix:: autoconf.h $(BUILT_HEADERS)
+all-windows:: autoconf.h $(BUILT_HEADERS)
+
+$(srcdir)/autoconf.h.in: @MAINT@ $(srcdir)/autoconf.stmp
+$(srcdir)/autoconf.stmp: $(srcdir)/$(thisconfigdir)/configure.in $(SRCTOP)/aclocal.m4
 	$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 	cd $(srcdir)/$(thisconfigdir) && $(AUTOHEADER) --include=$(CONFIG_RELTOPDIR) $(AUTOHEADERFLAGS)
-	touch $(srcdir)/krb5/autoconf.stmp
+	touch $(srcdir)/autoconf.stmp
 	$(RM) -r $(srcdir)/$(thisconfigdir)/autom4te.cache
 
-krb5.h: krb5/autoconf.h $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
-		asn1_err.h
+##DOS##autoconf.h: win-mac.h
+##DOS##	$(CP) win-mac.h $@
+##DOS##osconf.h: stock\osconf.h
+##DOS##	$(CP) stock\osconf.h $@
+
+###############################################################################
+##DOS##!if 0
+autoconf.h: autoconf.stamp
+autoconf.stamp: $(srcdir)/autoconf.h.in $(thisconfigdir)/config.status
+	(cd $(thisconfigdir) && $(SHELL) config.status $(mydir)/autoconf.h)
+	touch autoconf.stamp
+
+SYSCONFDIR = @sysconfdir@
+LOCALSTATEDIR = @localstatedir@
+BINDIR = @bindir@
+SBINDIR = @sbindir@
+LIBDIR  = @libdir@
+
+PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
+		  -e "s+@PREFIX+$(INSTALL_PREFIX)+" \
+		  -e "s+@EXEC_PREFIX+$(INSTALL_EXEC_PREFIX)+" \
+		  -e "s+@BINDIR+$(BINDIR)+" \
+		  -e "s+@LIBDIR+$(LIBDIR)+" \
+		  -e "s+@SBINDIR+$(SBINDIR)+" \
+		  -e "s+@MODULEDIR+$(MODULE_DIR)+" \
+	-e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \
+	-e 's+@SYSCONFDIR+$(SYSCONFDIR)+' 
+
+OSCONFSRC = $(srcdir)/stock/osconf.h
+
+osconf.h: $(OSCONFSRC) Makefile
+	cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new
+	@set -x ; if cmp -s osconf.new osconf.h ; then : osconf.h is current ; \
+	else ($(RM) osconf.h ; $(CP) osconf.new osconf.h) fi
+	$(RM) osconf.new
+##DOS##!endif
+###############################################################################
+
+krb5.h: $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h asn1_err.h
 	echo "/* This file is generated, please don't edit it directly.  */" > krb5.h
 	cat $(srcdir)/krb5.hin krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
 		asn1_err.h >> krb5.h
@@ -62,17 +97,18 @@ krb524_err.h: $(SRCTOP)/lib/krb5/error_tables/krb524_err.et
 clean-unix::
 	$(RM) krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
 		asn1_err.h
+	$(RM) $(ET_HEADERS) autoconf.stamp
 
 clean-windows::
 	$(RM) com_err.h profile.h
 	$(RM) gssapi\gssapi.h gssapi\gssapi_generic.h gssapi\gssapi_krb5.h gssapi\timestamp
 	if exist gssapi\nul rmdir gssapi
-	cd krb5
-	@echo Making clean in include\krb5
-	$(MAKE) -$(MFLAGS) clean
-	cd ..
+	$(RM) osconf.h autoconf.h autoconf.stamp
 	@echo Making clean in include
 
+clean::
+	$(RM) osconf.new $(BUILT_HEADERS)
+
 install-headers-unix install:: krb5.h profile.h
 	$(INSTALL_DATA) krb5.h $(DESTDIR)$(KRB5_INCDIR)$(S)krb5.h
 	$(INSTALL_DATA) profile.h $(DESTDIR)$(KRB5_INCDIR)$(S)profile.h