From 9dab51f16ff35d82eb2c24c7e9cc876faa2f3b8f Mon Sep 17 00:00:00 2001 From: raja Date: Thu, 30 Jul 2009 09:02:30 +0000 Subject: [PATCH] * Makefile ($(build_lib)): Move cyclic dependencies onto this. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mcs@139040 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- class/System.Design/ChangeLog | 4 ++++ class/System.Design/Makefile | 2 +- class/System.Web/ChangeLog | 4 ++++ class/System.Web/Makefile | 8 ++++---- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/class/System.Design/ChangeLog b/class/System.Design/ChangeLog index 1671abd7e1..183c3946bd 100644 --- a/class/System.Design/ChangeLog +++ b/class/System.Design/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Raja R Harinath + + * Makefile ($(build_lib)): Move cyclic dependencies onto this. + 2009-05-26 Marek Habersack * System.Design.dll.sources: added diff --git a/class/System.Design/Makefile b/class/System.Design/Makefile index 98e358ab7b..f71c5bb86f 100644 --- a/class/System.Design/Makefile +++ b/class/System.Design/Makefile @@ -42,5 +42,5 @@ include ../../build/library.make ifdef DRAWING_DESIGN_DEP_FILE LIB_MCS_FLAGS += -define:DRAWING_DESIGN_DEP -r:$(DRAWING_DESIGN_DEP) -$(the_lib): $(DRAWING_DESIGN_DEP_FILE) +$(build_lib): $(DRAWING_DESIGN_DEP_FILE) endif diff --git a/class/System.Web/ChangeLog b/class/System.Web/ChangeLog index abb2ca41d8..54287ab63b 100644 --- a/class/System.Web/ChangeLog +++ b/class/System.Web/ChangeLog @@ -1,3 +1,7 @@ +2009-07-30 Raja R Harinath + + * Makefile ($(build_lib)): Move cyclic dependencies onto this. + 2009-07-23 Marek Habersack * Makefile (TEST_RESOURCE_FILES): added diff --git a/class/System.Web/Makefile b/class/System.Web/Makefile index 22e11249a7..10e2d8adff 100644 --- a/class/System.Web/Makefile +++ b/class/System.Web/Makefile @@ -232,17 +232,17 @@ include ../../build/library.make ifdef WEBSERVICES_DEP_FILE LIB_MCS_FLAGS += -define:WEBSERVICES_DEP -r:$(WEBSERVICES_DEP) -$(the_lib): $(WEBSERVICES_DEP_FILE) +$(build_lib): $(WEBSERVICES_DEP_FILE) endif ifdef MONOWEB_DEP_FILE LIB_MCS_FLAGS += -define:MONOWEB_DEP -r:$(MONOWEB_DEP) -$(the_lib): $(MONOWEB_DEP_FILE) +$(build_lib): $(MONOWEB_DEP_FILE) endif ifdef SYSTEMCORE_DEP_FILE LIB_MCS_FLAGS += -define:SYSTEMCORE_DEP -r:$(SYSTEMCORE_DEP) -$(the_lib): $(SYSTEMCORE_DEP_FILE) +$(build_lib): $(SYSTEMCORE_DEP_FILE) endif ifdef DEBUG @@ -261,7 +261,7 @@ ifdef DEVEL LIB_MCS_FLAGS += -define:DEVEL endif -$(the_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1) +$(build_lib): $(RESX_RES) $(RESOURCE_FILES2) $(RESOURCE_FILES_1) $(RESX_RES): %.resources: %.resx $(RESGEN) `echo $< | $(PLATFORM_CHANGE_SEPARATOR_CMD)` -- 2.11.4.GIT