From 2baf648b637daef9c1243511fa94887f071241c0 Mon Sep 17 00:00:00 2001
From: Theodore Tso <tytso@mit.edu>
Date: Mon, 25 Sep 1995 20:37:51 +0000
Subject: [PATCH] Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the
 Makefile

aclocal.m4 (MAKE_SUBDIRS, DO_SUBDIRS): MAKE_SUBDIRS now takes three
	arguments; DO_SUBDIRS now generates target rules of the form:
	"foo-unix: <for each subdirectory> make foo".  All of the macros
	which generated targets "all", "install", "clean", etc. now generate
	targets "all-unix", "install-unix", "clean-unix".

	This scheme allows us to do multiple-platform builds, while
	preserving ordering constraints that we need in order to build
	library subdirectories correctly.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6854 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/ChangeLog   | 16 ++++++++++++++++
 src/Makefile.in |  4 ----
 src/aclocal.m4  | 30 ++++++++++++++----------------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5de26e8cb..be0b232b7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+Mon Sep 25 16:32:57 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* Makefile.in: Removed "foo:: foo-$(WHAT)" lines from the
+		Makefile. 
+
+	* aclocal.m4 (MAKE_SUBDIRS, DO_SUBDIRS): MAKE_SUBDIRS now takes
+		three arguments; DO_SUBDIRS now generates target rules of
+		the form: "foo-unix: <for each subdirectory> make foo".
+		All of the macros which generated targets "all",
+		"install", "clean", etc. now generate targets "all-unix",
+		"install-unix", "clean-unix".  
+
+		This scheme allows us to do multiple-platform builds,
+		while preserving ordering constraints that we need in
+		order to build library subdirectories correctly.
+
 Sun Sep 24 12:00:00 1995  John Rivlin <jrivlin@fusion.com>
 
 	* Makefile.in: Update CLEANUP list to clean up files created
diff --git a/src/Makefile.in b/src/Makefile.in
index aa7f2d4d0..4a3a2f8ec 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -5,8 +5,6 @@ HDRS =
 
 DISTFILES = $(SRCS) $(HDRS) COPYING COPYING.LIB ChangeLog Makefile.in
 
-all:: all-$(WHAT)
-
 all-unix::
 
 all-mac::
@@ -59,8 +57,6 @@ install-mkdirs:
 TAGS: $(SRCS)
 	etags $(SRCS)
 
-clean:: clean-$(WHAT)
-
 clean-:: clean-windows
 clean-mac:: clean-unix
 clean-unix::
diff --git a/src/aclocal.m4 b/src/aclocal.m4
index 2fa2f7108..9f708f712 100644
--- a/src/aclocal.m4
+++ b/src/aclocal.m4
@@ -80,7 +80,7 @@ esac
 dnl
 dnl append subdir rule -- MAKE_SUBDIRS("making",all)
 dnl
-define(_MAKE_SUBDIRS,[dnl
+define(MAKE_SUBDIRS,[dnl
 AC_PUSH_MAKEFILE()dnl
 changequote(<<<,>>>)dnl
 
@@ -100,8 +100,6 @@ $2::<<<
 changequote([,])dnl
 AC_POP_MAKEFILE()dnl
 ])dnl
-define(MAKE_SUBDIRS,[dnl
-_MAKE_SUBDIRS($1, $2, $2)])dnl
 dnl
 dnl take saved makefile stuff and put it in the Makefile
 dnl
@@ -133,10 +131,10 @@ dnl
 dnl drop in standard subdirectory rules
 dnl
 define(DO_SUBDIRS,[dnl
-MAKE_SUBDIRS("making",all)
-MAKE_SUBDIRS("cleaning",clean)
-MAKE_SUBDIRS("installing",install)
-MAKE_SUBDIRS("checking",check)
+MAKE_SUBDIRS("making",all-unix, all)
+MAKE_SUBDIRS("cleaning",clean-unix, clean)
+MAKE_SUBDIRS("installing",install-unix, install)
+MAKE_SUBDIRS("checking",check-unix, check)
 ])dnl
 dnl
 dnl drop in standard rules for all configure files -- CONFIG_RULES
@@ -499,7 +497,7 @@ dnl create DONE file for lib/krb5 -- SubdirLibraryRule(list)
 define(SubdirLibraryRule,[
 AC_PUSH_MAKEFILE()dnl
 
-all:: DONE
+all-unix:: DONE
 
 DONE:: $1
 	@if test x'$1' = x && test -r [$]@; then :;\
@@ -507,7 +505,7 @@ DONE:: $1
 		(set -x; echo $1 > [$]@) \
 	fi
 
-clean::
+clean-unix::
 	$(RM) DONE
 AC_POP_MAKEFILE()dnl
 ])dnl
@@ -524,7 +522,7 @@ includes:: $1
 		(set -x; [$](RM) $2/$1;	[$](CP) $1 $2/$1) \
 	fi
 
-clean::
+clean-unix::
 	$(RM) $2/$1
 
 AC_POP_MAKEFILE()dnl
@@ -542,7 +540,7 @@ includes:: $1
 		(set -x; [$](RM) $2/$1;	[$](CP) $(srcdir)/$1 $2/$1) \
 	fi
 
-clean::
+clean-unix::
 	$(RM) $2/$1
 
 AC_POP_MAKEFILE()dnl
@@ -551,7 +549,7 @@ dnl
 dnl Krb5InstallHeaders(headers,destdir)
 define(Krb5InstallHeaders,[
 AC_PUSH_MAKEFILE()dnl
-install:: $1
+install-unix:: $1
 	@set -x; for f in $1 ; \
 	do [$](INSTALL_DATA) [$$]f $2/[$$]f ; \
 	done
@@ -859,9 +857,9 @@ AC_SUBST(STEXT)
 DO_MAKE_SHLIB="$1.\$""(SHEXT)"
 AC_PUSH_MAKEFILE()dnl
 
-all:: [$](DO_MAKE_SHLIB) [$](SHLIB_STATIC_TARGET)
+all-unix:: [$](DO_MAKE_SHLIB) [$](SHLIB_STATIC_TARGET)
 
-clean:: 
+clean-unix:: 
 	$(RM) $1.[$](SHEXT) [$](SHLIB_STATIC_TARGET)
 
 $1.[$](SHEXT): [$](LIBDONE) [$](DEPLIBS)
@@ -875,9 +873,9 @@ STEXT=$krb5_cv_noshlibs_ext
 AC_SUBST(STEXT)
 DO_MAKE_SHLIB=
 AC_PUSH_MAKEFILE()
-all:: [$](DO_MAKE_SHLIB) [$](SHLIB_STATIC_TARGET)
+all-unix:: [$](DO_MAKE_SHLIB) [$](SHLIB_STATIC_TARGET)
 
-clean:: 
+clean-unix:: 
 	$(RM) $1.[$](STEXT)
 AC_POP_MAKEFILE()
 ])dnl
-- 
2.26.2