# HG changeset patch # User Matt Johnston # Date 1519052686 -28800 # Node ID 47fcbdd12d9b9921222cb0858d45e31fd77d7e70 # Parent 198e2ee0f4b1324b8b2dea8d9065fa26ec8e18ed Remove bad merged libtommmath "clean" rule and leftover makefile.include diff -r 198e2ee0f4b1 -r 47fcbdd12d9b libtommath/Makefile.in --- a/libtommath/Makefile.in Mon Feb 19 22:16:50 2018 +0800 +++ b/libtommath/Makefile.in Mon Feb 19 23:04:46 2018 +0800 @@ -126,19 +126,6 @@ pretty: perl pretty.build -#\zipup the project (take that!) -no_oops: clean - cd .. ; cvs commit - echo Scanning for scratch/dirty files - find . -type f | grep -v CVS | xargs -n 1 bash mess.sh - -clean: - rm -f *.bat *.pdf *.o *.a *.obj *.lib *.exe *.dll etclib/*.o demo/demo.o test ltmtest mpitest mtest/mtest mtest/mtest.exe \ - *.idx *.toc *.log *.aux *.dvi *.lof *.ind *.ilg *.ps *.log *.s mpi.c *.da *.dyn *.dpi tommath.tex `find . -type f | grep [~] | xargs` *.lo *.la - rm -rf .libs - -cd etc && MAKE=${MAKE} ${MAKE} clean - -cd pics && MAKE=${MAKE} ${MAKE} clean - .PHONY: pre_gen pre_gen: perl gen.pl diff -r 198e2ee0f4b1 -r 47fcbdd12d9b libtommath/makefile.include --- a/libtommath/makefile.include Mon Feb 19 22:16:50 2018 +0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ -# -# Include makefile for libtommath -# - -#version of library -VERSION=1.0 -VERSION_SO=1:0 - -# default make target -default: ${LIBNAME} - -# Compiler and Linker Names -ifndef PREFIX - PREFIX= -endif - -ifeq ($(CC),cc) - CC = $(PREFIX)gcc -endif -LD=$(PREFIX)ld -AR=$(PREFIX)ar -RANLIB=$(PREFIX)ranlib - -ifndef MAKE - MAKE=make -endif - -CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow - -ifndef NO_ADDTL_WARNINGS -# additional warnings -CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align -CFLAGS += -Wstrict-prototypes -Wpointer-arith -endif - -ifdef COMPILE_DEBUG -#debug -CFLAGS += -g3 -else - -ifdef COMPILE_SIZE -#for size -CFLAGS += -Os -else - -ifndef IGNORE_SPEED -#for speed -CFLAGS += -O3 -funroll-loops - -#x86 optimizations [should be valid for any GCC install though] -CFLAGS += -fomit-frame-pointer -endif - -endif # COMPILE_SIZE -endif # COMPILE_DEBUG - -# adjust coverage set -ifneq ($(filter $(shell arch), i386 i686 x86_64 amd64 ia64),) - COVERAGE = test_standalone timing - COVERAGE_APP = ./test && ./ltmtest -else - COVERAGE = test_standalone - COVERAGE_APP = ./test -endif - -HEADERS_PUB=tommath.h tommath_class.h tommath_superclass.h -HEADERS=tommath_private.h $(HEADERS_PUB) - -test_standalone: CFLAGS+=-DLTM_DEMO_TEST_VS_MTEST=0 - -#LIBPATH-The directory for libtommath to be installed to. -#INCPATH-The directory to install the header files for libtommath. -#DATAPATH-The directory to install the pdf docs. -LIBPATH?=/usr/lib -INCPATH?=/usr/include -DATAPATH?=/usr/share/doc/libtommath/pdf - -#make the code coverage of the library -# -coverage: CFLAGS += -fprofile-arcs -ftest-coverage -DTIMING_NO_LOGS -coverage: LFLAGS += -lgcov -coverage: LDFLAGS += -lgcov - -coverage: $(COVERAGE) - $(COVERAGE_APP) - -lcov: coverage - rm -f coverage.info - lcov --capture --no-external --no-recursion $(LCOV_ARGS) --output-file coverage.info -q - genhtml coverage.info --output-directory coverage -q - -# target that removes all coverage output -cleancov-clean: - rm -f `find . -type f -name "*.info" | xargs` - rm -rf coverage/ - -# cleans everything - coverage output and standard 'clean' -cleancov: cleancov-clean clean - -clean: - rm -f *.gcda *.gcno *.bat *.o *.a *.obj *.lib *.exe *.dll etclib/*.o demo/demo.o test ltmtest mpitest mtest/mtest mtest/mtest.exe \ - *.idx *.toc *.log *.aux *.dvi *.lof *.ind *.ilg *.ps *.log *.s mpi.c *.da *.dyn *.dpi tommath.tex `find . -type f | grep [~] | xargs` *.lo *.la - rm -rf .libs/ - cd etc ; MAKE=${MAKE} ${MAKE} clean - cd pics ; MAKE=${MAKE} ${MAKE} clean diff -r 198e2ee0f4b1 -r 47fcbdd12d9b libtommath/makefile_include.mk --- a/libtommath/makefile_include.mk Mon Feb 19 22:16:50 2018 +0800 +++ b/libtommath/makefile_include.mk Mon Feb 19 23:04:46 2018 +0800 @@ -17,12 +17,13 @@ CROSS_COMPILE= endif -ifeq ($(CC),cc) - CC = $(CROSS_COMPILE)gcc -endif -LD=$(CROSS_COMPILE)ld -AR=$(CROSS_COMPILE)ar -RANLIB=$(CROSS_COMPILE)ranlib +# Dropbear passes these down +#ifeq ($(CC),cc) +# CC = $(CROSS_COMPILE)gcc +#endif +#LD=$(CROSS_COMPILE)ld +#AR=$(CROSS_COMPILE)ar +#RANLIB=$(CROSS_COMPILE)ranlib ifndef MAKE MAKE=make @@ -113,5 +114,5 @@ rm -f *.gcda *.gcno *.gcov *.bat *.o *.a *.obj *.lib *.exe *.dll etclib/*.o demo/demo.o test ltmtest mpitest mtest/mtest mtest/mtest.exe \ *.idx *.toc *.log *.aux *.dvi *.lof *.ind *.ilg *.ps *.log *.s mpi.c *.da *.dyn *.dpi tommath.tex `find . -type f | grep [~] | xargs` *.lo *.la rm -rf .libs/ - ${MAKE} -C etc/ clean MAKE=${MAKE} - ${MAKE} -C doc/ clean MAKE=${MAKE} + #${MAKE} -C etc/ clean MAKE=${MAKE} + #${MAKE} -C doc/ clean MAKE=${MAKE}