2002-12-3 DennisHayes <dennish@raytek.com>

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

diff --git a/mcs/class/library.make b/mcs/class/library.make
index 53c9c1d039dd00e9c0e9320793c05044165f77b4..dfc3ba9294463925b4c36405ea4cd78842aa3ec8 100644 (file)
--- a/mcs/class/library.make
+++ b/mcs/class/library.make
@@ -8,7 +8,7 @@ prefix = /usr
 
 SOURCES_CMD=find . \
        ! \( $(SOURCES_INCLUDE:%=! -path '%' ) \) -a    \
-         \( $(SOURCES_EXCLUDE:%=! -path '%' ) \) -a    \
+         \( $(SOURCES_EXCLUDE:%=! -path '%' ) ! -path '/dev/null' \) -a        \
          ! -path '*/__*.cs'
 
 
@@ -28,10 +28,10 @@ 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: " >$@.new
+       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" >>$@
@@ -42,7 +42,7 @@ 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
@@ -52,3 +52,10 @@ 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
+