Parcourir la source

Simplify slightly.

svn path=/trunk/mcs/; revision=29101
Raja R Harinath il y a 21 ans
Parent
commit
fb98cfaf90
2 fichiers modifiés avec 5 ajouts et 6 suppressions
  1. 1 1
      mcs/class/System/ChangeLog
  2. 4 5
      mcs/class/System/Makefile

+ 1 - 1
mcs/class/System/ChangeLog

@@ -1,6 +1,6 @@
 2004-06-09  Raja R Harinath  <[email protected]>
 
-	* Makefile (HAVE_CYCLIC_DEP_FILE): New.  Used to detect if
+	* Makefile (CYCLIC_DEP_FILE): New.  Used to detect if
 	System.Xml.dll is present.
 	(SECOND_PASS): Remove.
 

+ 4 - 5
mcs/class/System/Makefile

@@ -12,15 +12,14 @@ LIB_MCS_FLAGS = /r:$(corlib)
 TEST_MCS_FLAGS = /nowarn:1595 /nowarn:0618
 
 CYCLIC_DEP := System.Xml.dll
-CYCLIC_DEP_FILE := ../lib/$(PROFILE)/$(CYCLIC_DEP)
-HAVE_CYCLIC_DEP_FILE := $(wildcard $(CYCLIC_DEP_FILE))
+CYCLIC_DEP_FILE := $(wildcard ../lib/$(PROFILE)/$(CYCLIC_DEP))
 
 EXTRA_DISTFILES = \
 	System.Text.RegularExpressions/notes.txt	\
 	System.ComponentModel.Design/Changelog		\
 	Test/test-config-file
 
-ifdef HAVE_CYCLIC_DEP_FILE
+ifdef CYCLIC_DEP_FILE
 LIB_MCS_FLAGS += /define:XML_DEP /r:$(CYCLIC_DEP)
 else
 
@@ -33,11 +32,11 @@ endif
 
 include ../../build/library.make
 
-ifdef HAVE_CYCLIC_DEP_FILE
+ifdef CYCLIC_DEP_FILE
 $(the_lib): $(CYCLIC_DEP_FILE)
 else
 $(the_lib): echo-warning
 .PHONY: echo-warning
 echo-warning:
 	@echo "** Building temporary System.dll without parts that depend on System.Xml"
-endif
+endif