diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-27 11:15:11 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-07-27 11:15:11 +0200 |
| commit | 387f807fb69e4b45fd56d4ba05dc65b93bf97809 (patch) | |
| tree | 7a1d1a8191a6b3d46fe49025776ecd45569676c1 /package/palantir/patches | |
| parent | 1bd2bb0a91821025a50407f1b5a7e316e2e29eb5 (diff) | |
| parent | 5b8ca9882625b354c5d935a14067568414fc369e (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/palantir/patches')
| -rw-r--r-- | package/palantir/patches/patch-server_Makefile | 26 | ||||
| -rw-r--r-- | package/palantir/patches/patch-server_libgsm_Makefile | 53 |
2 files changed, 0 insertions, 79 deletions
diff --git a/package/palantir/patches/patch-server_Makefile b/package/palantir/patches/patch-server_Makefile deleted file mode 100644 index a9bc81951..000000000 --- a/package/palantir/patches/patch-server_Makefile +++ /dev/null @@ -1,26 +0,0 @@ ---- palantir-2.7.orig/server/Makefile 2007-05-19 01:31:36.000000000 +0200 -+++ palantir-2.7/server/Makefile 2011-01-20 15:24:19.478658283 +0100 -@@ -47,10 +47,11 @@ ENABLE_X11MON= 0 - .PHONY : tools man - - --CFLAGS= -Wall -D_REENTRANT -O2 -g -+CFLAGS?= -Wall -D_REENTRANT -O2 -g - # -O3 --CC= gcc --libjpeg= -ljpeg -+CC?= gcc -+LIBS?= -+LIBS+= -ljpeg -lpthread - - ifeq ($(TARGET),mips) - BROADCOM_SRC= /usr/local/broadcom/src -@@ -86,7 +87,7 @@ SRCS= *.c - libgsm= libgsm/lib/libgsm.a - - palantir: $(libgsm) $(OBJ) tools man -- $(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(libgsm) $(libjpeg) -lpthread -o palantir -+ $(CC) $(LDFLAGS) $(OBJ) $(libgsm) $(LIBS) -o palantir - - mips: - make TARGET=mips palantir diff --git a/package/palantir/patches/patch-server_libgsm_Makefile b/package/palantir/patches/patch-server_libgsm_Makefile deleted file mode 100644 index 079e9a825..000000000 --- a/package/palantir/patches/patch-server_libgsm_Makefile +++ /dev/null @@ -1,53 +0,0 @@ ---- palantir-2.7.orig/server/libgsm/Makefile 2007-03-31 11:50:49.000000000 +0200 -+++ palantir-2.7/server/libgsm/Makefile 2011-01-20 15:22:46.318658281 +0100 -@@ -49,11 +49,11 @@ WAV49 = -DWAV49 - # CCFLAGS = -c -O - - ifndef CC --CC = gcc -+CC ?= gcc - endif - --CC += -ansi -pedantic --CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -+CFLAGS += -ansi -pedantic -+CPPFLAGS ?= -DNeedFunctionPrototypes=1 - - LD = $(CC) - -@@ -80,7 +80,7 @@ SHELL = /bin/sh - LN = ln - BASENAME = basename - ifndef AR --AR = ar -+AR ?= ar - endif - ARFLAGS = cr - RMFLAGS = -@@ -89,7 +89,7 @@ COMPRESS = compress - COMPRESSFLAGS = - # RANLIB = true - ifndef RANLIB --RANLIB = ranlib -+RANLIB ?= ranlib - endif - - # -@@ -109,7 +109,7 @@ INC = $(ROOT)/inc - # DEBUG = -DNDEBUG - ######### Remove -DNDEBUG to enable assertions. - --CFLAGS = $(CCFLAGS) $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ -+CFLAGS += $(SASR) $(DEBUG) $(MULHACK) $(FAST) $(LTP_CUT) \ - $(WAV49) $(CCINC) -I$(INC) - ######### It's $(CC) $(CFLAGS) - -@@ -177,7 +177,7 @@ GSM_OBJECTS = $(SRC)/add.o \ - # Default rules - - .c.o: -- $(CC) $(CFLAGS) $? -+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $? - @-mv `$(BASENAME) $@` $@ > /dev/null 2>&1 - - # Target rules |