patch-Makefile 3.0 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788899091
  1. --- brutefir-1.0m.orig/Makefile 2013-11-29 14:55:01.000000000 +0100
  2. +++ brutefir-1.0m/Makefile 2015-11-29 10:28:02.031683531 +0100
  3. @@ -1,11 +1,11 @@
  4. ###################################
  5. # Where to install
  6. -INSTALL_PREFIX = $(DESTDIR)/usr/local
  7. +INSTALL_PREFIX = $(DESTDIR)/usr
  8. ###################################
  9. # Where to find libraries, and their header files.
  10. -LIBPATHS = -L/usr/local/lib
  11. -INCLUDE = -I/usr/local/include
  12. +# LIBPATHS = -L/usr/local/lib
  13. +# INCLUDE = -I/usr/local/include
  14. ifdef FFTW_PATH
  15. LIBPATHS += -L$(FFTW_PATH)/lib
  16. INCLUDE += -I$(FFTW_PATH)/include
  17. @@ -17,17 +17,17 @@ FFTW_LIB = -lfftw3 -lfftw3f
  18. ###################################
  19. # Binaries
  20. -FLEX = flex
  21. -LD = ld
  22. -CC = gcc
  23. -AS = as
  24. +#FLEX = flex
  25. +#CC = gcc
  26. +#LD = ld
  27. +#AS = as
  28. ###################################
  29. # Flags
  30. CC_WARN = -Wall -Wpointer-arith -Wshadow \
  31. -Wcast-align -Wwrite-strings -Wstrict-prototypes \
  32. -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
  33. -CC_FLAGS = $(DEFINE) -O2
  34. +CC_FLAGS = $(DEFINE) $(CFLAGS)
  35. CC_FPIC = -fPIC
  36. LD_SHARED = -shared
  37. @@ -59,15 +59,11 @@ LIB_TARGETS = cli.bflogic eq.bflogic fil
  38. UNAME = $(shell uname)
  39. UNAME_P = $(shell uname -p)
  40. -UNAME_M = $(shell uname -m)
  41. +UNAME_M ?=
  42. # Linux
  43. ifeq ($(UNAME),Linux)
  44. -ifeq ($(UNAME_M),i586)
  45. -BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
  46. -CC_FLAGS += -msse
  47. -endif
  48. -ifeq ($(UNAME_M),i686)
  49. +ifeq ($(UNAME_M),x86)
  50. BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
  51. CC_FLAGS += -msse
  52. endif
  53. @@ -127,25 +123,25 @@ bfconf_lexical.o: bfconf_lexical.c
  54. $(FLEX) -o$@ $<
  55. brutefir: $(BRUTEFIR_OBJS)
  56. - $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
  57. + $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS) -lgcc
  58. alsa.bfio: $(BFIO_ALSA_OBJS)
  59. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  60. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc -lgcc
  61. oss.bfio: $(BFIO_OSS_OBJS)
  62. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
  63. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc -lgcc
  64. jack.bfio: $(BFIO_JACK_OBJS)
  65. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  66. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc -lgcc
  67. file.bfio: $(BFIO_FILE_OBJS)
  68. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  69. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc -lgcc
  70. cli.bflogic: $(BFLOGIC_CLI_OBJS)
  71. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  72. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc -lgcc
  73. eq.bflogic: $(BFLOGIC_EQ_OBJS)
  74. - $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  75. + $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc -lgcc
  76. install: $(BIN_TARGETS) $(LIB_TARGETS)
  77. install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir