In build:

	* Makefile (dist-local): Remove special-case code.
	* rules.make ($(depsdir)): New rule to create the dependencies
	directory on demand.
	* library.make, executable.make: Make generated files depend on
	$(depsdir).
	* profiles/basic.make: Likewise.

In class/corlib:
	* Makefile (cmp_makefrag, cmp_response): Depend on $(depsdir).

svn path=/trunk/mcs/; revision=77230

mcs/build/ChangeLog

@@ -1,5 +1,12 @@
 2007-05-11  Raja R Harinath  <[email protected]>
 
+	* Makefile (dist-local): Remove special-case code.
+	* rules.make ($(depsdir)): New rule to create the dependencies
+	directory on demand.
+	* library.make, executable.make: Make generated files depend on
+	$(depsdir).
+	* profiles/basic.make: Likewise.
+
 	* profiles/net_2_0_bootstrap.make: Move rules for mcs.exe to
 	mcs/Makefile.
 	* library.make (the_libdir, build_libdir): New.  Create these

mcs/build/Makefile

@@ -36,4 +36,4 @@ DISTFILES = \
 	$(PLATFORMS:%=platforms/%.make) $(PROFILES:%=profiles/%.make)
 
 dist-local: dist-default
-	$(MKINSTALLDIRS) $(distdir)/deps
+

mcs/build/deps/.cvsignore

@@ -1,4 +0,0 @@
-*.makefrag
-*.response
-*.stamp
-*.was_signed

mcs/build/executable.make

@@ -112,4 +112,8 @@ endif
 -include $(makefrag)
 
 all-local: $(makefrag)
-$(makefrag): $(topdir)/build/executable.make
+
+ifneq ($(response),$(sourcefile))
+$(response): $(topdir)/build/executable.make | $(depsdir)
+endif
+$(makefrag): $(topdir)/build/executable.make | $(depsdir)

mcs/build/library.make

@@ -359,4 +359,7 @@ $(btest_makefrag): $(btest_response)
 endif
 
 all-local: $(makefrag) $(test_makefrag) $(btest_makefrag)
-$(makefrag) $(test_makefrag) $(btest_makefrag): $(topdir)/build/library.make
+ifneq ($(response),$(sourcefile))
+$(response): $(topdir)/build/library.make | $(depsdir)
+endif
+$(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/library.make | $(depsdir)

mcs/build/profiles/basic.make

@@ -3,7 +3,7 @@
 with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 with_mono_path_monolite = MONO_PATH="$(topdir)/class/lib/monolite$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
 
-monolite_flag := $(topdir)/build/deps/use-monolite
+monolite_flag := $(depsdir)/use-monolite
 use_monolite := $(wildcard $(monolite_flag))
 
 ifdef use_monolite
@@ -38,7 +38,7 @@ clean-profile:
 post-profile-cleanup:
 	@rm -f $(monolite_flag)
 
-PROFILE_CS  = $(topdir)/build/deps/basic-profile-check.cs
+PROFILE_CS  = $(depsdir)/basic-profile-check.cs
 PROFILE_EXE = $(PROFILE_CS:.cs=.exe)
 PROFILE_OUT = $(PROFILE_CS:.cs=.out)
 
@@ -67,7 +67,7 @@ do-profile-check-monolite:
 
 else
 
-do-profile-check-monolite:
+do-profile-check-monolite: $(depsdir)
 	echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2
 	echo "*** Trying the 'monolite' directory." 1>&2
 	echo dummy > $(monolite_flag)
@@ -75,7 +75,7 @@ do-profile-check-monolite:
 
 endif
 
-$(PROFILE_CS): $(topdir)/build/profiles/basic.make
+$(PROFILE_CS): $(topdir)/build/profiles/basic.make | $(depsdir)
 	echo 'class X { static int Main () { return 0; } }' > $@
 
 $(PROFILE_EXE): $(PROFILE_CS)

mcs/build/rules.make

@@ -158,6 +158,9 @@ dist-default:
 	    $(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
 	done
 
+$(depsdir):
+	$(MKINSTALLDIRS) $@
+
 # Useful
 
 withmcs:

mcs/class/corlib/ChangeLog

@@ -1,3 +1,7 @@
+2007-05-11  Raja R Harinath  <[email protected]>
+
+	* Makefile (cmp_makefrag, cmp_response): Depend on $(depsdir).
+
 2007-05-11  Rolf Bjarne Kvinge  <[email protected]>
 
 	* corlib_test.dll.sources: Added DebuggerDisplayAttributeTest.cs.

mcs/class/corlib/Makefile

@@ -68,4 +68,6 @@ $(cmp_makefrag): $(cmp_response)
 # leading to a broken build.
 #
 # -include $(cmp_makefrag)
+
+$(cmp_response) $(cmp_makefrag): Makefile | $(depsdir)
 endif