[svn-commits] qwell: trunk r447 - in /trunk: ./ Makefile

Mon Aug 27 14:22:04 CDT 2007

Author: qwell
Date: Mon Aug 27 14:22:03 2007
New Revision: 447

URL: http://svn.digium.com/view/libpri?view=rev&rev=447
Log:
Merged revisions 446 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.4

................
r446 | qwell | 2007-08-27 14:21:08 -0500 (Mon, 27 Aug 2007) | 10 lines

Merged revisions 445 via svnmerge from 
https://origsvn.digium.com/svn/libpri/branches/1.2

........
r445 | qwell | 2007-08-27 14:20:23 -0500 (Mon, 27 Aug 2007) | 2 lines

Make sure we build both the static and shared modules with -fPIC.

........

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

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------

--- branch-1.2-merged (original)
+++ branch-1.2-merged Mon Aug 27 14:22:03 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-332,385,389,415,423,426
+/branches/1.2:1-332,385,389,415,423,426,445

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Mon Aug 27 14:22:03 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-372,386,390,416,424,427,441
+/branches/1.4:1-372,386,390,416,424,427,441,446

Modified: trunk/Makefile
URL: http://svn.digium.com/view/libpri/trunk/Makefile?view=diff&rev=447&r1=446&r2=447
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Aug 27 14:22:03 2007
@@ -36,7 +36,7 @@
 DYNAMIC_LIBRARY=libpri.so.1.0
 STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o
 DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS)
+CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS)
 INSTALL_PREFIX=$(DESTDIR)
 INSTALL_BASE=/usr
 SOFLAGS = -Wl,-hlibpri.so.1.0
@@ -118,7 +118,7 @@
 endif
 
 %.lo : %.c
-	$(CC) -fPIC $(CFLAGS) -o $@ -c $<
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 $(STATIC_LIBRARY): $(STATIC_OBJS)
 	ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS)


