MessageFormatter.cs: Corrected some bugs that affected serialization of exceptions

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

diff --git a/mcs/class/library.make b/mcs/class/library.make
index 2818cb67de65afd8e326cc8d3ef26617d758f2a4..de78d39d82099cf47cd30ae583cc710292d74a45 100644 (file)
--- a/mcs/class/library.make
+++ b/mcs/class/library.make
@@ -1,28 +1,61 @@
-MCS = mono $(topdir)/mcs/mcs.exe
+#USE_SOURCE_RULES=1
+RUNTIME = mono
+MCS = mcs
 MCS_FLAGS = --target library --noconfig
 INSTALL = /usr/bin/install
 prefix = /usr
 
+
 SOURCES_CMD=find . \
-         \( -false $(SOURCES_INCLUDE:%=-o -path '%') \) -a      \
-       ! \( -false $(SOURCES_EXCLUDE:%=-o -path '%') \)
+       ! \( $(SOURCES_INCLUDE:%=! -path '%' ) \) -a    \
+         \( $(SOURCES_EXCLUDE:%=! -path '%' ) ! -path '/dev/null' \) -a        \
+         ! -path '*/__*.cs'
+
 
 all: .makefrag $(LIBRARY)
 
 clean:
-       -rm -rf $(LIBRARY) .response .makefrag
+       -rm -rf $(LIBRARY) .response .makefrag library-deps.stamp
+
+
+ifdef USE_SOURCE_RULES
 
 .PHONY: .makefrag
 .makefrag:
        @echo -n "SOURCES=" >$@
        @$(SOURCES_CMD) | tee .response | sed -e 's/$$/ \\/' >>$@
 
+else
+
+.response: $(LIB_LIST)
+       cat $^ |egrep '\.cs[[:space:]]*$$' >$@
+
+.makefrag: $(LIB_LIST) $(topdir)/class/library.make
+       echo -n "library-deps.stamp: $(LIB_LIST) " >$@.new
+       cat $< |egrep '\.cs$$' | sed -e 's,\.cs,.cs \\,' >>$@.new
+       cat $@.new |sed -e '$$s, \\$$,,' >$@
+       echo -e "\ttouch library-deps.stamp" >>$@
+       rm -rf $@.new
+
+endif
+
 -include .makefrag
 
-$(LIBRARY): $(SOURCES) $(topdir)/class/library.make
+ifdef USE_SOURCE_RULES
+$(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
 
 install: all
        mkdir -p $(prefix)/lib/
        $(INSTALL) -m 644 $(LIBRARY) $(prefix)/lib/
 
+ifdef TEST_DIR
+test:
+       $(MAKE) -C $(TEST_DIR) -f makefile.gnu $@
+else
+test:
+endif
+