[zaptel-commits] qwell: trunk r2964 - in /trunk: ./ Makefile

Mon Aug 27 16:43:36 CDT 2007

Author: qwell
Date: Mon Aug 27 16:43:36 2007
New Revision: 2964

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2964
Log:
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

........

................

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?view=diff&rev=2964&r1=2963&r2=2964
==============================================================================

--- trunk/Makefile (original)
+++ trunk/Makefile Mon Aug 27 16:43:36 2007
@@ -31,7 +31,7 @@
 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 @@
 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: 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 $@ $^


