diff options
| author | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-27 21:43:36 +0000 |
|---|---|---|
| committer | qwell <qwell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-27 21:43:36 +0000 |
| commit | 81cf3af825f7720e743bbf6b39166a0bdbd3d953 (patch) | |
| tree | e76e3969ee874bcb70796afbdb229a8701ec48e7 | |
| parent | 376acacf6d68e143c86a82147fc819c75dd2df79 (diff) | |
Merged revisions 2963 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2963 | qwell | 2007-08-27 16:42:29 -0500 (Mon, 27 Aug 2007) | 11 lines
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/trunk@2964 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -31,7 +31,7 @@ endif KVERS_MAJ:=$(shell echo $(KVERS) | cut -d. -f1-2) KINCLUDES:=$(KSRC)/include -CFLAGS+=-I. -O4 -g -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER +CFLAGS+=-I. -O4 -g -fPIC -Wall -DBUILDING_TONEZONE #-DTONEZONE_DRIVER ifneq (,$(findstring ppc,$(UNAME_M))) CFLAGS_PPC:=-fsigned-char endif @@ -39,7 +39,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 @@ -237,10 +236,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 $@ $^ torisatool: torisatool.o $(CC) -o $@ $^ |