aboutsummaryrefslogtreecommitdiff
path: root/example
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 /example
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 'example')
-rw-r--r--example/Makefile.inc6
1 files changed, 2 insertions, 4 deletions
diff --git a/example/Makefile.inc b/example/Makefile.inc
index 9184b6aa7..1893e9e1d 100644
--- a/example/Makefile.inc
+++ b/example/Makefile.inc
@@ -4,16 +4,14 @@ TESTS_ENVIRONMENT = EXEEXT=${EXEEXT}
LDADD = $(LIB)/libodphelper.la $(LIB)/lib$(ODP_LIB_NAME).la
-AM_CFLAGS = \
+AM_CFLAGS += \
-I$(srcdir) \
-I$(top_srcdir)/example \
$(ODP_INCLUDES) \
$(HELPER_INCLUDES)
if STATIC_APPS
-AM_LDFLAGS = -L$(LIB) -static
-else
-AM_LDFLAGS =
+AM_LDFLAGS += -L$(LIB) -static
endif
AM_LDFLAGS += $(PLAT_DEP_LIBS)