patch-Makefile 3.2 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596
  1. --- brutefir-1.0o.orig/Makefile 2016-11-15 13:39:48.000000000 +0100
  2. +++ brutefir-1.0o/Makefile 2017-03-27 06:25:27.528418184 +0200
  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. @@ -63,17 +59,12 @@ LIB_TARGETS = cli.bflogic eq.bflogic fil
  38. ###################################
  39. # System-specific settings
  40. -UNAME = $(shell uname)
  41. -UNAME_P = $(shell uname -p)
  42. -UNAME_M = $(shell uname -m)
  43. +UNAME = Linux
  44. +UNAME_M ?=
  45. # Linux
  46. ifeq ($(UNAME),Linux)
  47. -ifeq ($(UNAME_M),i586)
  48. -BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
  49. -CC_FLAGS += -msse
  50. -endif
  51. -ifeq ($(UNAME_M),i686)
  52. +ifeq ($(UNAME_M),x86)
  53. BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
  54. CC_FLAGS += -msse
  55. endif
  56. @@ -127,27 +118,27 @@ brutefir: $(BRUTEFIR_OBJS)
  57. $(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
  58. alsa.bfio: $(BFIO_ALSA_OBJS)
  59. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  60. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  61. $(CHMOD) $(CHMOD_REMOVEX) $@
  62. oss.bfio: $(BFIO_OSS_OBJS)
  63. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
  64. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
  65. $(CHMOD) $(CHMOD_REMOVEX) $@
  66. jack.bfio: $(BFIO_JACK_OBJS)
  67. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  68. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  69. $(CHMOD) $(CHMOD_REMOVEX) $@
  70. file.bfio: $(BFIO_FILE_OBJS)
  71. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  72. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  73. $(CHMOD) $(CHMOD_REMOVEX) $@
  74. cli.bflogic: $(BFLOGIC_CLI_OBJS)
  75. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  76. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  77. $(CHMOD) $(CHMOD_REMOVEX) $@
  78. eq.bflogic: $(BFLOGIC_EQ_OBJS)
  79. - $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  80. + $(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  81. $(CHMOD) $(CHMOD_REMOVEX) $@
  82. install: $(BIN_TARGETS) $(LIB_TARGETS)