patch-Makefile 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  1. --- brutefir-1.0o.orig/Makefile 2016-11-15 13:39:48.000000000 +0100
  2. +++ brutefir-1.0o/Makefile 2017-03-16 21:10:39.821793707 +0100
  3. @@ -5,12 +5,12 @@ LDFLAGS +=
  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 =
  13. +INCLUDE =
  14. ifdef FFTW_PATH
  15. LIBPATHS += -L$(FFTW_PATH)/lib
  16. INCLUDE += -I$(FFTW_PATH)/include
  17. @@ -21,20 +21,16 @@ endif
  18. FFTW_LIB = -lfftw3 -lfftw3f
  19. ###################################
  20. -# Binaries
  21. -FLEX = flex
  22. -LD = gcc
  23. -CC = gcc
  24. -CHMOD = chmod
  25. ###################################
  26. # Flags
  27. CC_WARN = -Wall -Wpointer-arith -Wshadow \
  28. -Wcast-align -Wwrite-strings -Wstrict-prototypes \
  29. -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
  30. -CC_FLAGS = $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
  31. +CC_FLAGS = $(DEFINE) $(CFLAGS) $(CPPFLAGS)
  32. CC_FPIC = -fPIC
  33. LD_SHARED = -shared
  34. +CHMOD = chmod
  35. CHMOD_REMOVEX = -x
  36. ###################################
  37. @@ -66,14 +62,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,27 +120,27 @@ brutefir: $(BRUTEFIR_OBJS)
  54. $(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
  55. alsa.bfio: $(BFIO_ALSA_OBJS)
  56. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  57. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  58. $(CHMOD) $(CHMOD_REMOVEX) $@
  59. oss.bfio: $(BFIO_OSS_OBJS)
  60. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
  61. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
  62. $(CHMOD) $(CHMOD_REMOVEX) $@
  63. jack.bfio: $(BFIO_JACK_OBJS)
  64. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  65. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  66. $(CHMOD) $(CHMOD_REMOVEX) $@
  67. file.bfio: $(BFIO_FILE_OBJS)
  68. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  69. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  70. $(CHMOD) $(CHMOD_REMOVEX) $@
  71. cli.bflogic: $(BFLOGIC_CLI_OBJS)
  72. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  73. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  74. $(CHMOD) $(CHMOD_REMOVEX) $@
  75. eq.bflogic: $(BFLOGIC_EQ_OBJS)
  76. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  77. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  78. $(CHMOD) $(CHMOD_REMOVEX) $@
  79. install: $(BIN_TARGETS) $(LIB_TARGETS)