[svn-commits] qwell: branch 1.4 r2963 - in /branches/1.4: ./ Makefile

[SVN commits to the Digium repositories]

Author: qwell
Date: Mon Aug 27 16:42:29 2007
New Revision: 2963

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2963
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/Makefile

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

Modified: branches/1.4/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/Makefile?view=diff&rev=2963&r1=2962&r2=2963
==============================================================================
--- branches/1.4/Makefile (original)
+++ branches/1.4/Makefile Mon Aug 27 16:42:29 2007
@@ -139,7 +139,7 @@
 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 @@
 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: 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 > $@