summaryrefslogtreecommitdiffstats
path: root/watchquagga
diff options
context:
space:
mode:
authorPaul Jakma <paul@jakma.org>2015-08-20 22:30:17 +0200
committerDonald Sharp <sharpd@cumulusnetwroks.com>2016-05-26 02:38:35 +0200
commit95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f (patch)
treed2517bf85a1376d441a63d15a572573721b8615a /watchquagga
parentpimd: Clean up some more compile warnings (diff)
downloadfrr-95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f.tar.xz
frr-95bb83054bbf6b5f4fcc7e7ce961d63d74212f9f.zip
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 'watchquagga')
-rw-r--r--watchquagga/Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/watchquagga/Makefile.am b/watchquagga/Makefile.am
index 5842f99ef..3f7d8954f 100644
--- a/watchquagga/Makefile.am
+++ b/watchquagga/Makefile.am
@@ -3,8 +3,7 @@
INCLUDES = @INCLUDES@ -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib
DEFS = @DEFS@ -DSTATEDIR=\"$(localstatedir)/\"
-AM_CFLAGS = $(PICFLAGS) $(WERROR)
-AM_LDFLAGS = $(PILDFLAGS)
+AM_CFLAGS = $(WERROR)
sbin_PROGRAMS = watchquagga