Author: raja
Date: 2008-02-18 00:19:22 -0500 (Mon, 18 Feb 2008)
New Revision: 96027
Modified:
trunk/mcs/class/System/ChangeLog
trunk/mcs/class/System/Makefile
Log:
* Makefile (CYCLIC_DEPS): Don't use $(eval ...) -- we still
support older GNU makes.
Modified: trunk/mcs/class/System/ChangeLog
===================================================================
--- trunk/mcs/class/System/ChangeLog 2008-02-18 05:00:10 UTC (rev 96026)
+++ trunk/mcs/class/System/ChangeLog 2008-02-18 05:19:22 UTC (rev 96027)
@@ -1,3 +1,8 @@
+2008-02-18 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile (CYCLIC_DEPS): Don't use $(eval ...) -- we still
+ support older GNU makes.
+
2008-02-17 Gert Driesen <[EMAIL PROTECTED]>
* System_test.dll.sources: Added CharConverterTest.cs and
Modified: trunk/mcs/class/System/Makefile
===================================================================
--- trunk/mcs/class/System/Makefile 2008-02-18 05:00:10 UTC (rev 96026)
+++ trunk/mcs/class/System/Makefile 2008-02-18 05:19:22 UTC (rev 96027)
@@ -63,25 +63,46 @@
CYCLIC_DEPS :=
CYCLIC_DEP_FILES :=
-define cyclic-dep
-# Note the '$$' -- those are to be delayed till the eval
-CYCLIC_DEPS += $1
-FILE_$2 := $$(wildcard ../lib/$(PROFILE)/$1)
-ifdef FILE_$2
-CYCLIC_DEP_FILES += $$(FILE_$2)
-LIB_MCS_FLAGS += -d:$2 -r:$1
-endif
-endef
+# define cyclic-dep
+# # Note the '$$' -- those are to be delayed till the eval
+# CYCLIC_DEPS += $1
+# FILE_$2 := $$(wildcard ../lib/$(PROFILE)/$1)
+# ifdef FILE_$2
+# CYCLIC_DEP_FILES += $$(FILE_$2)
+# LIB_MCS_FLAGS += -d:$2 -r:$1
+# endif
+# endef
ifneq (2.1, $(FRAMEWORK_VERSION))
-$(eval $(call cyclic-dep,System.Xml.dll,XML_DEP))
+# $(eval $(call cyclic-dep,System.Xml.dll,XML_DEP))
+CYCLIC_DEPS += System.Xml.dll
+FILE_XML_DEP := $(wildcard ../lib/$(PROFILE)/System.Xml.dll)
+ifdef FILE_XML_DEP
+CYCLIC_DEP_FILES += $(FILE_XML_DEP)
+LIB_MCS_FLAGS += -d:XML_DEP -r:System.Xml.dll
endif
+endif
+
ifeq (2.0, $(FRAMEWORK_VERSION))
-$(eval $(call cyclic-dep,Mono.Security.dll,SECURITY_DEP))
-$(eval $(call cyclic-dep,System.Configuration.dll,CONFIGURATION_DEP))
+# $(eval $(call cyclic-dep,Mono.Security.dll,SECURITY_DEP))
+CYCLIC_DEPS += Mono.Security.dll
+FILE_SECURITY_DEP := $(wildcard ../lib/$(PROFILE)/Mono.Security.dll)
+ifdef FILE_SECURITY_DEP
+CYCLIC_DEP_FILES += $(FILE_SECURITY_DEP)
+LIB_MCS_FLAGS += -d:SECURITY_DEP -r:Mono.Security.dll
endif
+# $(eval $(call cyclic-dep,System.Configuration.dll,CONFIGURATION_DEP))
+CYCLIC_DEPS += System.Configuration.dll
+FILE_CONFIGURATION_DEP := $(wildcard
../lib/$(PROFILE)/System.Configuration.dll)
+ifdef FILE_CONFIGURATION_DEP
+CYCLIC_DEP_FILES += $(FILE_CONFIGURATION_DEP)
+LIB_MCS_FLAGS += -d:CONFIGURATION_DEP -r:System.Configuration.dll
+endif
+
+endif
+
MISSING_DEPS := $(filter-out $(notdir $(CYCLIC_DEP_FILES)), $(CYCLIC_DEPS))
ifdef MISSING_DEPS
NO_SIGN_ASSEMBLY = yes
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
