Workaround for hidden symbols in makefile.shared

Author: czurnieden

etc/tune.c

@@ -728,7 +728,8 @@ int main(int argc, char **argv)
    }
    /* TODO: add graphs for radix conversion, too? */
    if (args.print == 1) {
-      printf("Printing data for graphing to \"%s\", \"%s\", \"%s\", and \"%s\"\n",mullog, sqrlog, rcreadlog, rcwritelog);
+      printf("Printing up to %d datapoints for graphing to \"%s\", \"%s\", \"%s\", and \"%s\"\n",args.upper_limit_print,
+             mullog, sqrlog, rcreadlog, rcwritelog);
 
       multiplying = fopen(mullog, "w+");
       if (multiplying == NULL) {
@@ -756,7 +757,8 @@ int main(int argc, char **argv)
 
 
       for (x = 1; x < args.upper_limit_print; x += args.increment_print) {
-         printf("\r%d", (rgs.upper_limit_print - x));
+         printf("\r%d", x);
+         fflush(stdout);
          set_cutoffs(&max_cutoffs);
          t1 = s_time_mul(x);
          set_cutoffs(&orig);

makefile.shared

@@ -93,22 +93,56 @@ $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
 mtest:
 	cd mtest ; $(CC) $(LTM_CFLAGS) -O0 mtest.c $(LTM_LDFLAGS) -o mtest
 
-tune: $(LIBNAME)
+tuneold: $(LIBNAME)
 	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/tune.c -o etc/tune.o
 	$(LTLINK) $(LTM_LDFLAGS) -o etc/tune etc/tune.o $(LIBNAME)
 	cd etc/; /bin/sh tune_it.sh; cd ..
 	$(MAKE) -f makefile.shared
 
+tune:
+	$(MAKE) -f makefile tune
+	$(MAKE) -f makefile clean
+	$(MAKE) -f makefile.shared
+
 
-graphs: $(LIBNAME)
+graphsold: $(LIBNAME)
 	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/tune.c -o etc/tune.o
 	$(LTLINK) $(LTM_LDFLAGS) -o etc/tune etc/tune.o $(LIBNAME)
 	$(LTCOMPILE) $(LTM_CFLAGS) -c etc/get_limbsize.c -o etc/get_limbsize.o
 	$(LTLINK) $(LTM_LDFLAGS) -o etc/get_limbsize etc/get_limbsize.o $(LIBNAME)
-	cd etc/
-	/bin/sh tune_it.sh 2000
-	gnuplot -c plot_graphs.gp `./get_limbsize`
+	cd etc/;\
+	/bin/sh tune_it.sh 2000;\
+	gnuplot -c plot_graphs.gp `./get_limbsize`;\
+	cd ..
+	$(MAKE) -f makefile.shared
+
+
+# Most of the substitution tricks do not work in Posix make and/or shell
+# so we do it by hand. (Yes, it has to be in one line)
+graphs:
+	$(MAKE) -f makefile graphs
+	cd etc/;\
+	/bin/mv multiplying.png multiplying.png_backup;\
+	/bin/mv squaring.png squaring.png_backup;\
+	/bin/mv readradix.png readradix.png_backup;\
+	/bin/mv writeradix.png writeradix.png_backup;\
+	/bin/mv multiplying multiplying_backup;\
+	/bin/mv squaring squaring_backup;\
+	/bin/mv readradix readradix_backup;\
+	/bin/mv writeradix writeradix_backup;\
+	cd ..
+	$(MAKE) -f makefile clean
+	cd etc/;\
+	/bin/mv multiplying.png_backup multiplying.png;\
+	/bin/mv squaring.png_backup squaring.png;\
+	/bin/mv readradix.png_backup readradix.png;\
+	/bin/mv writeradix.png_backup writeradix.png;\
+	/bin/mv multiplying_backup multiplying;\
+	/bin/mv squaring_backup squaring;\
+	/bin/mv readradix_backup readradix;\
+	/bin/mv writeradix_backup writeradix;\
 	cd ..
 	$(MAKE) -f makefile.shared
 
 
+