Makefile cleanup

diff --git a/src/make/Makefile b/src/make/Makefile
index 3c182afa38a743ea9c361e6b1ca397a09af42c12..71e3939f6c248eb19a6e7b3f95a7a5cd927a5910 100644 (file)
--- a/src/make/Makefile
+++ b/src/make/Makefile
@@ -382,6 +382,8 @@ clean:
        make -C ../test/test2              clean
        find ../ -name *.oc | xargs rm -f
        find ../ -name *.dc | xargs rm -f
+       find ../ -name *.oa | xargs rm -f
+       find ../ -name *.da | xargs rm -f
 
 
 

diff --git a/src/make/makestg2 b/src/make/makestg2
index 2b3b4bf1ef3454b90b1a26dd8a489d5b1abf05eb..0f85c1660abe862f20ab40605cb5fbc07bd8b091 100644 (file)
--- a/src/make/makestg2
+++ b/src/make/makestg2
@@ -176,7 +176,9 @@ iblInit: $(CFG_MODULES) $(MODULES)
        ../util/btoccs/b2i2c ibl_$(TARGET)/ibl.b ibl_$(TARGET)/ibl.i2c.b
        ../util/btoccs/b2ccs ibl_$(TARGET)/ibl.i2c.b ibl_$(TARGET)/ibl_init.i2c.$(IEXT).ccs
 
-       bash ../util/symExtract/symExtract ibl_$(TARGET)/ibl_$(TARGET)_init.map ibl_$(TARGET)/ibl_init_symbols.inc $(COMMON_SYMBOLS)
+       sed -e 's/\\r//' ../util/symExtract/symExtract > ../util/symExtract/symExtract_unix
+       bash ../util/symExtract/symExtract_unix ibl_$(TARGET)/ibl_$(TARGET)_init.map ibl_$(TARGET)/ibl_init_symbols.inc $(COMMON_SYMBOLS)
+       rm -f ../util/symExtract/symExtract_unix
 
        
 iblMain: iblInit $(CFG_MODULES) $(MODULES)