2003-04-24 Miguel de Icaza <miguel@ximian.com>

[mono.git] / mcs / class / library.make

diff --git a/mcs/class/library.make b/mcs/class/library.make
index 7052a1057feb22970d30541ac4121024ffadc79e..bedaebd7a13c05364fac8f03f67c052409a0e399 100644 (file)
--- a/mcs/class/library.make
+++ b/mcs/class/library.make
@@ -1,7 +1,7 @@
 #USE_SOURCE_RULES=1
 RUNTIME = mono
 MCS = $(RUNTIME) $(topdir)/mcs/mcs.exe
-MCS_FLAGS = --target library --noconfig
+MY_MCS_FLAGS = --target library --noconfig $(MCS_FLAGS)
 INSTALL = /usr/bin/install
 prefix = /usr
 
@@ -28,7 +28,7 @@ ifdef USE_SOURCE_RULES
 else
 
 .response: $(LIB_LIST)
-       cat $^ |egrep '\.cs$$' >$@
+       cat $^ |egrep '\.cs[[:space:]]*$$' >$@
 
 .makefrag: $(LIB_LIST) $(topdir)/class/library.make
        echo -n "library-deps.stamp: $(LIB_LIST) " >$@.new
@@ -42,11 +42,11 @@ endif
 -include .makefrag
 
 ifdef USE_SOURCE_RULES
-$(LIBRARY): $(SOURCES) $(topdir)/class/library.make
+$(LIBRARY): makefile.gnu $(SOURCES) $(topdir)/class/library.make
 else
 $(LIBRARY): .response library-deps.stamp
 endif
-       MONO_PATH=$(MONO_PATH_PREFIX)$(MONO_PATH) $(MCS) $(MCS_FLAGS) -o $(LIBRARY) $(LIB_FLAGS) @.response
+       MONO_PATH=$(MONO_PATH_PREFIX)$(MONO_PATH) $(MCS) $(MY_MCS_FLAGS) -o $(LIBRARY) $(LIB_FLAGS) @.response
 
 install: all
        mkdir -p $(prefix)/lib/
@@ -54,7 +54,7 @@ install: all
 
 ifdef TEST_DIR
 test:
-       $(MAKE) -C $(TEST_DIR) -f makefile.gnu $@
+       if [ ! -z $(TEST_DIR) -a -d $(TEST_DIR) ]; then $(MAKE) -C $(TEST_DIR) -f makefile.gnu $@; fi
 else
 test:
 endif