File csdr-fix-makefile.diff of Package csdr
Index: csdr-0.15/Makefile =================================================================== --- csdr-0.15.orig/Makefile +++ csdr-0.15/Makefile @@ -28,17 +28,11 @@ LIBSOURCES = fft_fftw.c libcsdr_wrapper.c #SOURCES = csdr.c $(LIBSOURCES) -cpufeature = $(if $(findstring $(1),$(shell cat /proc/cpuinfo)),$(2)) -PARAMS_SSE = $(call cpufeature,sse,-msse) $(call cpufeature,sse2,-msse2) $(call cpufeature,sse3,-msse3) $(call cpufeature,sse4a,-msse4a) $(call cpufeature,sse4_1,-msse4.1) $(call cpufeature,sse4_2,-msse4.2 -msse4) -mfpmath=sse -PARAMS_NEON = -mfloat-abi=hard -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -funsafe-math-optimizations -Wformat=0 -DNEON_OPTS -#tnx Jan Szumiec for the Raspberry Pi support -PARAMS_RASPI = -mfloat-abi=hard -mcpu=arm1176jzf-s -mfpu=vfp -funsafe-math-optimizations -Wformat=0 -PARAMS_ARM = $(if $(call cpufeature,BCM2708,dummy-text),$(PARAMS_RASPI),$(PARAMS_NEON)) -PARAMS_SIMD = $(if $(call cpufeature,sse,dummy-text),$(PARAMS_SSE),$(PARAMS_ARM)) PARAMS_LOOPVECT = -O3 -ffast-math -fdump-tree-vect-details -dumpbase dumpvect PARAMS_LIBS = -g -lm -lrt -lfftw3f -DUSE_FFTW -DLIBCSDR_GPL -DUSE_IMA_ADPCM PARAMS_SO = -fpic PARAMS_MISC = -Wno-unused-result +CFLAGS ?= #DEBUG_ON = 0 #debug is always on by now (anyway it could be compiled with `make DEBUG_ON=1`) #PARAMS_DEBUG = $(if $(DEBUG_ON),-g,) FFTW_PACKAGE = fftw-3.3.3 @@ -56,11 +50,11 @@ libcsdr.so: fft_fftw.c fft_rpi.c libcsdr @ln -fs libcsdr.so.$(SOVERSION) libcsdr.so -./parsevect dumpvect*.vect csdr: csdr.c libcsdr.so - gcc -std=gnu99 $(PARAMS_LOOPVECT) $(PARAMS_SIMD) csdr.c $(PARAMS_LIBS) -L. -lcsdr $(PARAMS_MISC) -o csdr + gcc $(CFLAGS) -std=gnu99 $(PARAMS_LOOPVECT) $(PARAMS_SIMD) csdr.c $(PARAMS_LIBS) -L. -lcsdr $(PARAMS_MISC) -o csdr ddcd: ddcd.cpp libcsdr.so ddcd.h - g++ $(PARAMS_LOOPVECT) $(PARAMS_SIMD) ddcd.cpp $(PARAMS_LIBS) -L. -lcsdr -lpthread $(PARAMS_MISC) -o ddcd + g++ $(CFLAGS) $(PARAMS_LOOPVECT) $(PARAMS_SIMD) ddcd.cpp $(PARAMS_LIBS) -L. -lcsdr -lpthread $(PARAMS_MISC) -o ddcd nmux: nmux.cpp libcsdr.so nmux.h tsmpool.cpp tsmpool.h - g++ $(PARAMS_LOOPVECT) $(PARAMS_SIMD) nmux.cpp tsmpool.cpp $(PARAMS_LIBS) -L. -lcsdr -lpthread $(PARAMS_MISC) -o nmux + g++ $(CFLAGS) $(PARAMS_LOOPVECT) $(PARAMS_SIMD) nmux.cpp tsmpool.cpp $(PARAMS_LIBS) -L. -lcsdr -lpthread $(PARAMS_MISC) -o nmux arm-cross: clean-vect #note: this doesn't work since having added FFTW arm-linux-gnueabihf-gcc -std=gnu99 -O3 -fshort-double -ffast-math -dumpbase dumpvect-arm -fdump-tree-vect-details -mfloat-abi=softfp -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mvectorize-with-neon-quad -Wno-unused-result -Wformat=0 $(SOURCES) -lm -o ./csdr @@ -69,12 +63,14 @@ clean-vect: clean: clean-vect rm -f libcsdr.so.$(SOVERSION) csdr ddcd nmux *.o *.so install: all - install -m 0755 libcsdr.so.$(SOVERSION) $(PREFIX)/lib - install -m 0755 csdr $(PREFIX)/bin - install -m 0755 csdr-fm $(PREFIX)/bin - install -m 0755 nmux $(PREFIX)/bin + install -d $(DESTDIR)$(PREFIX)/lib + install -m 0644 libcsdr.so.$(SOVERSION) $(DESTDIR)$(PREFIX)/lib + install -d $(DESTDIR)$(PREFIX)/bin + install -m 0755 csdr $(DESTDIR)$(PREFIX)/bin + install -m 0755 csdr-fm $(DESTDIR)$(PREFIX)/bin + install -m 0755 nmux $(DESTDIR)$(PREFIX)/bin #-install -m 0755 ddcd $(PREFIX)/bin - @ldconfig || echo please run ldconfig + #@ldconfig || echo please run ldconfig uninstall: rm $(PREFIX)/lib/libcsdr.so.$(SOVERSION) $(PREFIX)/bin/csdr $(PREFIX)/bin/csdr-fm ldconfig
