diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-27 21:42:29 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-27 21:42:29 +0000 |
| commit | 08e69736f4e7c6abcdbc216c01289b058f732ae6 (patch) | |
| tree | 1ce3001e28633ccdfd485ba425ea085dfc8b7e6f | |
| parent | 6de48adbd436283f77b865f836bb9fcebb433265 (diff) | |
Merged revisions 2962 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2962 | qwell | 2007-08-27 16:38:48 -0500 (Mon, 27 Aug 2007) | 3 lines
Make sure we build the static version of libtonezone
(and as a side-effect, all of the programs) with -fPIC
........
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@2963 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -139,7 +139,7 @@ else endif OPTFLAG=-O2 -CFLAGS+=-I. $(OPTFLAGS) -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER +CFLAGS+=-I. $(OPTFLAGS) -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER ifneq (,$(findstring ppc,$(UNAME_M))) CFLAGS_PPC:=-fsigned-char endif @@ -147,7 +147,6 @@ ifneq (,$(findstring x86_64,$(UNAME_M))) CFLAGS_x86_64:=-m64 endif CFLAGS+=$(CFLAGS_PPC) $(CFLAGS_x86_64) -LCFLAGS=-fPIC $(CFLAGS) -DBUILDING_TONEZONE KFLAGS=-I$(KINCLUDES) -O6 KFLAGS+=-DMODULE -D__KERNEL__ -DEXPORT_SYMTAB -I$(KSRC)/drivers/net \ -Wall -I. -Wstrict-prototypes -fomit-frame-pointer -I$(KSRC)/drivers/net/wan -I$(KINCLUDES)/net @@ -304,10 +303,10 @@ tor2ee.o: tor2-hw.h tor2ee: LDLIBS+=-lpci zonedata.lo: zonedata.c - $(CC) -c $(LCFLAGS) -o $@ $^ + $(CC) -c $(CFLAGS) -o $@ $^ tonezone.lo: tonezone.c - $(CC) -c $(LCFLAGS) -o $@ $^ + $(CC) -c $(CFLAGS) -o $@ $^ tones.h: gendigits ./gendigits > $@ |