aboutsummaryrefslogtreecommitdiff
path: root/helper
diff options
context:
space:
mode:
authorJere Leppänen <jere.leppanen@nokia.com>2022-08-22 15:10:25 +0300
committerMatias Elo <matias.elo@nokia.com>2022-09-09 10:24:07 +0300
commit053fe3a0744fe7197a79a6d34a9d5349e4b0a3e7 (patch)
tree37f8f94236911e95df1b50991f92d61fa494b9b4 /helper
parent2d4280b47a0445187e18752ce91e2d76fd05fd50 (diff)
configure: use ODP_*FLAGS instead of *FLAGS
Instead of setting CFLAGS (and CXXFLAGS, LDFLAGS) in configure, use ODP_CFLAGS instead. Then, in main level Makefile.inc, set AM_CFLAGS based on ODP_CFLAGS. Consequently, program_CFLAGS will work as intended. Also, don't do AC_SUBST([LIBS]). LIBS is handled automatically, since it's a preset variable. Signed-off-by: Jere Leppänen <jere.leppanen@nokia.com> Reviewed-by: Matias Elo <matias.elo@nokia.com>
Diffstat (limited to 'helper')
-rw-r--r--helper/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/helper/Makefile.am b/helper/Makefile.am
index 2b89c2223..458a99f92 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS = \
$(ODP_INCLUDES) \
$(HELPER_INCLUDES) \
$(LIBCLI_CPPFLAGS)
-AM_CFLAGS = $(PTHREAD_CFLAGS)
+AM_CFLAGS += $(PTHREAD_CFLAGS)
-AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)'
+AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)'
helperincludedir = $(includedir)/odp/helper/
helperinclude_HEADERS = \