1
0

patch-server_libgsm_Makefile 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253
  1. --- palantir-2.7.orig/server/libgsm/Makefile 2007-03-31 11:50:49.000000000 +0200
  2. +++ palantir-2.7/server/libgsm/Makefile 2011-01-20 15:22:46.318658281 +0100
  3. @@ -49,11 +49,11 @@ WAV49 = -DWAV49
  4. # CCFLAGS = -c -O
  5. ifndef CC
  6. -CC = gcc
  7. +CC ?= gcc
  8. endif
  9. -CC += -ansi -pedantic
  10. -CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1
  11. +CFLAGS += -ansi -pedantic
  12. +CPPFLAGS ?= -DNeedFunctionPrototypes=1
  13. LD = $(CC)
  14. @@ -80,7 +80,7 @@ SHELL = /bin/sh
  15. LN = ln
  16. BASENAME = basename
  17. ifndef AR
  18. -AR = ar
  19. +AR ?= ar
  20. endif
  21. ARFLAGS = cr
  22. RMFLAGS =
  23. @@ -89,7 +89,7 @@ COMPRESS = compress
  24. COMPRESSFLAGS =
  25. # RANLIB = true
  26. ifndef RANLIB
  27. -RANLIB = ranlib
  28. +RANLIB ?= ranlib
  29. endif
  30. #
  31. @@ -109,7 +109,7 @@ INC = $(ROOT)/inc
  32. # DEBUG = -DNDEBUG
  33. ######### Remove -DNDEBUG to enable assertions.
  34. -CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
  35. +CFLAGS += $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \
  36. $(WAV49) $(CCINC) -I$(INC)
  37. ######### It's $(CC) $(CFLAGS)
  38. @@ -177,7 +177,7 @@ GSM_OBJECTS = $(SRC)/add.o \
  39. # Default rules
  40. .c.o:
  41. - $(CC) $(CFLAGS) $?
  42. + $(CC) $(CPPFLAGS) $(CFLAGS) -c $?
  43. @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
  44. # Target rules