summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorPaul Jakma <paul@jakma.org>2015-08-20 21:30:17 +0100
committerPaul Jakma <paul@quagga.net>2015-09-03 16:44:48 +0100
commit52c0bc739b1184621525e64720b944268d6b0eeb (patch)
treea556a51ef56f6ccaa63c942c9880c684fc4b3bae /bgpd
parentc8ee940cc695cbcf9c0156ee6f72730f1fff9814 (diff)
downloadquagga-52c0bc739b1184621525e64720b944268d6b0eeb.tar.bz2
quagga-52c0bc739b1184621525e64720b944268d6b0eeb.tar.xz
build: Remove the old PIC/PIE patch, let libtool sort it out
* Remove the old change from '08 to add in PIE arguments at automake level. Versions of libtool since then know how to deal with -fpie and do the right thing according to whether its building shared or executable objects. So just pass '-fpie' as CFLAG and let libtool do its thing.
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/bgpd/Makefile.am b/bgpd/Makefile.am
index 92fa10cd..4659ac68 100644
--- a/bgpd/Makefile.am
+++ b/bgpd/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
INSTALL_SDATA=@INSTALL@ -m 600
-AM_CFLAGS = $(PICFLAGS) $(WERROR)
-AM_LDFLAGS = $(PILDFLAGS)
+AM_CFLAGS = $(WERROR)
noinst_LIBRARIES = libbgp.a
sbin_PROGRAMS = bgpd