From 3205202c3026473946ba9a8779c98b50afbda207 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 27 Apr 2004 06:02:52 +0000 Subject: Put libraries in profile dependant directories so we can build all profiles at once. svn path=/trunk/mcs/; revision=26040 --- mcs/class/Mono.Posix/ChangeLog | 5 +++++ mcs/class/Mono.Posix/Makefile | 8 ++++---- mcs/class/System.Data/ChangeLog | 4 ++++ mcs/class/System.Data/Makefile | 2 +- mcs/class/System/ChangeLog | 5 +++++ mcs/class/System/Makefile | 4 ++-- mcs/class/corlib/ChangeLog | 4 ++++ mcs/class/corlib/Makefile | 36 ++++++++++++++++++------------------ 8 files changed, 43 insertions(+), 25 deletions(-) (limited to 'mcs/class') diff --git a/mcs/class/Mono.Posix/ChangeLog b/mcs/class/Mono.Posix/ChangeLog index b28515ead83..ed9dda304d4 100644 --- a/mcs/class/Mono.Posix/ChangeLog +++ b/mcs/class/Mono.Posix/ChangeLog @@ -1,3 +1,8 @@ +2004-04-26 Jackson Harper + + * Makefile: Dont use explicit lib references so the proper lib + directory is used. Output to profile directory. + 2004-01-07 Gonzalo Paniagua Javier * Makefile: handle win32 paths and copy Mono.Posix.dll to Mono.Posix diff --git a/mcs/class/Mono.Posix/Makefile b/mcs/class/Mono.Posix/Makefile index 7c120370db0..d8c457dc113 100644 --- a/mcs/class/Mono.Posix/Makefile +++ b/mcs/class/Mono.Posix/Makefile @@ -10,11 +10,11 @@ include ../../build/library.make all-local: Mono.Posix/make-map.exe -Mono.Posix/make-map.exe: Mono.Posix/make-map.cs ../lib/Mono.Posix.dll - cp ../lib/Mono.Posix.dll Mono.Posix/ +Mono.Posix/make-map.exe: Mono.Posix/make-map.cs ../lib/$(PROFILE)/Mono.Posix.dll + cp ../lib/$(PROFILE)/Mono.Posix.dll Mono.Posix/ ifneq ($(PLATFORM),win32) - $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:../lib/Mono.Posix.dll Mono.Posix/make-map.cs + $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:Mono.Posix.dll Mono.Posix/make-map.cs else - $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:../lib/Mono.Posix.dll Mono.Posix\\make-map.cs + $(CSCOMPILE) -out:Mono.Posix/make-map.exe -r:Mono.Posix.dll Mono.Posix\\make-map.cs endif diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog index 21d4796dfaa..cb4aadfc972 100644 --- a/mcs/class/System.Data/ChangeLog +++ b/mcs/class/System.Data/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: output to profile directory. + 2004-04-26 Atsushi Enomoto * System.Data.dll.sources : added CustomDataClassGenerator.cs. diff --git a/mcs/class/System.Data/Makefile b/mcs/class/System.Data/Makefile index f63d40e0de3..060d651366c 100644 --- a/mcs/class/System.Data/Makefile +++ b/mcs/class/System.Data/Makefile @@ -7,7 +7,7 @@ include ../../build/rules.make ifeq ($(PROFILE),atomic) system = System.dll else -system = $(topdir)/class/lib/System.dll +system = $(topdir)/class/lib/$(PROFILE)/System.dll endif LIBRARY = System.Data.dll diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog index 7e480d4a0a9..7ae11b15522 100644 --- a/mcs/class/System/ChangeLog +++ b/mcs/class/System/ChangeLog @@ -1,3 +1,8 @@ +2004-04-26 Jackson Harper + + * Makefile: Use new $(PROFILE) directory to search for cyclical + dependancy. + 2004-04-16 Lluis Sanchez Gual * System_test.dll.sources: Added diff --git a/mcs/class/System/Makefile b/mcs/class/System/Makefile index 420dc4ff78b..665ad66e7e4 100644 --- a/mcs/class/System/Makefile +++ b/mcs/class/System/Makefile @@ -22,10 +22,10 @@ ifdef SECOND_PASS include ../../build/library.make else all-local: - @if test ! -f ../lib/$(CYCLIC_DEP) ; then \ + @if test ! -f ../lib/$(PROFILE)/$(CYCLIC_DEP) ; then \ echo "Creating temporary $(LIBRARY) without $(CYCLIC_DEP) reference." ; \ $(MAKE) SECOND_PASS=yes || exit 1 ; \ - rm -f '$(depsdir)/$(LIBRARY).stamp'; \ + rm -f '$(depsdir)/$(PROFILE)_$(LIBRARY).stamp'; \ else \ $(MAKE) SECOND_PASS=yes EXTRA_FLAGS='/define:XML_DEP /r:$(CYCLIC_DEP)' || exit 1; \ fi diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog index 775dd4acb75..4179318f04f 100644 --- a/mcs/class/corlib/ChangeLog +++ b/mcs/class/corlib/ChangeLog @@ -1,3 +1,7 @@ +2004-04-26 Jackson Harper + + * Makefile: Use profile dependant directory. + 2004-04-26 Sebastien Pouliot * corlib_test.dll.sources: Added DESTest.cs. diff --git a/mcs/class/corlib/Makefile b/mcs/class/corlib/Makefile index 85b9f4559ea..54cd9b2aa23 100644 --- a/mcs/class/corlib/Makefile +++ b/mcs/class/corlib/Makefile @@ -16,10 +16,10 @@ endif LOCAL_MCS_FLAGS = /nowarn:649 /nowarn:169 -d:INSIDE_CORLIB -corlib = $(topdir)/class/lib/mscorlib.dll +corlib = $(topdir)/class/lib/$(PROFILE)/mscorlib.dll testlib = corlib_test.dll -cmplib = $(topdir)/class/lib/corlib_cmp.dll -reslib = $(topdir)/class/lib/corlib_res.dll +cmplib = $(topdir)/class/lib/$(PROFILE)/corlib_cmp.dll +reslib = $(topdir)/class/lib/$(PROFILE)/corlib_res.dll plattestlib = corlib_plattest.dll corpdb = $(patsubst %.dll,%.pdb,$(corlib)) @@ -29,33 +29,33 @@ respdb = $(patsubst %.dll,%.pdb,$(reslib)) plattestpdb = $(patsubst %.dll,%.pdb,$(plattestlib)) sourcefile = corlib.dll.sources -response = $(depsdir)/corlib.dll.response -makefrag = $(depsdir)/corlib.dll.makefrag -stampfile = $(depsdir)/corlib.dll.stamp +response = $(depsdir)/$(PROFILE)_corlib.dll.response +makefrag = $(depsdir)/$(PROFILE)_corlib.dll.makefrag +stampfile = $(depsdir)/$(PROFILE)_corlib.dll.stamp # disable, until people fix their code... #corlib_flags = /unsafe /nostdlib /d:INSIDE_CORLIB corlib_flags = /unsafe /nostdlib test_sourcefile = corlib_test.dll.sources -test_response = $(depsdir)/$(testlib).response -test_makefrag = $(depsdir)/$(testlib).makefrag -test_stampfile = $(depsdir)/$(testlib).stamp +test_response = $(depsdir)/$(PROFILE)_$(testlib).response +test_makefrag = $(depsdir)/$(PROFILE)_$(testlib).makefrag +test_stampfile = $(depsdir)/$(PROFILE)_$(testlib).stamp test_flags = /nowarn:0618 /nowarn:0672 /r:$(test_against) /r:$(topdir)/class/lib/NUnit.Framework.dll -cmp_response = $(depsdir)/corlib_cmp.dll.response -cmp_makefrag = $(depsdir)/corlib_cmp.dll.makefrag -cmp_stampfile = $(depsdir)/corlib_cmp.dll.stamp +cmp_response = $(depsdir)/$(PROFILE)_corlib_cmp.dll.response +cmp_makefrag = $(depsdir)/$(PROFILE)_corlib_cmp.dll.makefrag +cmp_stampfile = $(depsdir)/$(PROFILE)_corlib_cmp.dll.stamp cmp_flags = /r:$(PLATFORM_CORLIB) $(corlib_flags) -res_response = $(depsdir)/corlib_res.dll.response -res_makefrag = $(depsdir)/corlib_res.dll.makefrag -res_stampfile = $(depsdir)/corlib_res.dll.stamp +res_response = $(depsdir)/$(PROFILE)_corlib_res.dll.response +res_makefrag = $(depsdir)/$(PROFILE)_corlib_res.dll.makefrag +res_stampfile = $(depsdir)/$(PROFILE)_corlib_res.dll.stamp res_flags = /r:$(PLATFORM_CORLIB) $(corlib_flags) plattest_excludes = corlib_plattest.dll.excludes -plattest_response = $(depsdir)/$(plattestlib).response -plattest_makefrag = $(depsdir)/$(plattestlib).makefrag -plattest_stampfile = $(depsdir)/$(plattestlib).stamp +plattest_response = $(depsdir)/$(PROFILE)_$(plattestlib).response +plattest_makefrag = $(depsdir)/$(PROFILE)_$(plattestlib).makefrag +plattest_stampfile = $(depsdir)/$(PROFILE)_$(plattestlib).stamp plattest_flags = /debug+ /debug:full /nowarn:0618 /nowarn:0672 /r:$(PLATFORM_CORLIB) /r:$(topdir)/class/lib/NUnit.Framework.dll # Here, we make all. -- cgit v1.2.3