diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2021-04-21 11:54:48 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2021-04-21 15:42:36 +0200 |
| commit | 0c4285d77eb66642c7e16a0c8dfda9eea4a4a5b1 (patch) | |
| tree | 731db39537468eeddd6353ed0ac41cf0bdf237b6 /pceplib | |
| parent | build: make builddir include path consistent (diff) | |
| download | frr-0c4285d77eb66642c7e16a0c8dfda9eea4a4a5b1.tar.xz frr-0c4285d77eb66642c7e16a0c8dfda9eea4a4a5b1.zip | |
build: properly split CFLAGS from AC_CFLAGS
`CFLAGS` is a "user variable", not intended to be controlled by
configure itself. Let's put all the "important" stuff in AC_CFLAGS and
only leave debug/optimization controls in CFLAGS.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pceplib')
| -rw-r--r-- | pceplib/subdir.am | 2 | ||||
| -rw-r--r-- | pceplib/test/subdir.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pceplib/subdir.am b/pceplib/subdir.am index eee2ec28c..2633f678f 100644 --- a/pceplib/subdir.am +++ b/pceplib/subdir.am @@ -1,7 +1,7 @@ if PATHD_PCEP noinst_LTLIBRARIES = pceplib/libpcep_pcc.la pceplib/libsocket_comm_mock.la -pceplib_libpcep_pcc_la_CFLAGS = -fPIC +pceplib_libpcep_pcc_la_CFLAGS = $(AM_CFLAGS) -fPIC pceplib_libpcep_pcc_la_SOURCES = pceplib/pcep_msg_messages.c \ pceplib/pcep_msg_objects.c \ pceplib/pcep_msg_tlvs.c \ diff --git a/pceplib/test/subdir.am b/pceplib/test/subdir.am index 0ae61d1bc..88af59267 100644 --- a/pceplib/test/subdir.am +++ b/pceplib/test/subdir.am @@ -36,7 +36,7 @@ noinst_HEADERS += pceplib/test/pcep_msg_messages_test.h \ pceplib/test/pcep_utils_ordered_list_test.h \ pceplib/test/pcep_utils_queue_test.h -pceplib_test_pcep_msg_tests_CFLAGS = -I$(top_srcdir)/pceplib +pceplib_test_pcep_msg_tests_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/pceplib pceplib_test_pcep_msg_tests_LDADD = $(top_builddir)/pceplib/libpcep_pcc.la lib/libfrr.la -lcunit -lpthread pceplib_test_pcep_msg_tests_SOURCES = pceplib/test/pcep_msg_messages_test.c \ pceplib/test/pcep_msg_messages_tests.c \ @@ -47,7 +47,7 @@ pceplib_test_pcep_msg_tests_SOURCES = pceplib/test/pcep_msg_messages_test.c \ # The pcc_api_tests and pcep_session_logic_tests use the # socket_comm_mock, so the LDADD variable needs to be modified -pceplib_test_pcep_pcc_api_tests_CFLAGS = -I$(top_srcdir)/pceplib +pceplib_test_pcep_pcc_api_tests_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/pceplib pceplib_test_pcep_pcc_api_tests_LDADD = $(top_builddir)/pceplib/libsocket_comm_mock.la $(top_builddir)/pceplib/libpcep_pcc.la lib/libfrr.la -lcunit -lpthread pceplib_test_pcep_pcc_api_tests_SOURCES = pceplib/test/pcep_pcc_api_test.c pceplib/test/pcep_pcc_api_tests.c |