* Stubed Custommarshalers

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

diff --git a/mcs/class/library.make b/mcs/class/library.make
index ee4d743138c552199433d59b1b6d60aaa457f3b8..d1679e8f11be77fcfbca99bb0011a56bd3224b56 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
@@ -46,7 +46,7 @@ $(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/