trim trailing spaces/clean-up

makefile

@@ -154,6 +154,6 @@ zipup: no_oops docs clean
 	zip -9r tfm-$(VERSION).zip tomsfastmath-$(VERSION)/* ; \
 	mv -f tfm* ~ ; rm -rf tomsfastmath-$(VERSION)
 
-# $Source: /cvs/libtom/tomsfastmath/makefile,v $ 
-# $Revision: 1.38 $ 
-# $Date: 2007/03/13 01:23:03 $ 
+# $Source$
+# $Revision$
+# $Date$

makefile.shared

@@ -103,7 +103,7 @@ timing: $(LIBNAME) demo/test.o
 stest: $(LIBNAME) demo/stest.o
 	$(CC) $(CFLAGS) demo/stest.o $(LIBNAME_S) -o stest
 
-# $Source: /cvs/libtom/tomsfastmath/makefile.shared,v $ 
-# $Revision: 1.19 $ 
-# $Date: 2007/03/13 01:23:03 $ 
+# $Source$
+# $Revision$
+# $Date$
 

src/generators/makefile

@@ -11,7 +11,7 @@ comba_sqr_smallgen: comba_sqr_smallgen.c
 
 regen: comba_sqr_gen comba_sqr_smallgen
 	for i in 3 4 6 7 8 9 12 17 20 24 28 32 48 64; do \
-		./comba_sqr_gen $$i > ../sqr/fp_sqr_comba_$$i.c; \
+		./comba_sqr_gen $$i | sed -e 's/ *$$//' > ../sqr/fp_sqr_comba_$$i.c; \
 	done
 	./comba_sqr_smallgen > ../sqr/fp_sqr_comba_small_set.c
 

src/mul/fp_mul_comba.c

@@ -297,8 +297,11 @@ asm(                              \
 
 #define MULADD(i, j)                                    \
    do { fp_word t;                                      \
-   t = (fp_word)c0 + ((fp_word)i) * ((fp_word)j); c0 = t;                         \
-   t = (fp_word)c1 + (t >> DIGIT_BIT);            c1 = t; c2 += t >> DIGIT_BIT;   \
+   t = (fp_word)c0 + ((fp_word)i) * ((fp_word)j);       \
+   c0 = t;                                              \
+   t = (fp_word)c1 + (t >> DIGIT_BIT);                  \
+   c1 = t;                                              \
+   c2 += t >> DIGIT_BIT;                                \
    } while (0);
 
 #endif

updatemakes.sh

@@ -3,10 +3,12 @@
 bash genlist.sh > tmplist
 
 perl filter.pl makefile tmplist
-mv -f tmp.delme makefile
+sed -e 's/ *$//' < tmp.delme > makefile
+rm -f tmp.delme
 
 perl filter.pl makefile.shared tmplist
-mv -f tmp.delme makefile.shared
+sed -e 's/ *$//' < tmp.delme > makefile.shared
+rm -f tmp.delme
 
 rm -f tmplist
 rm -f tmp.delme