Skip to contentSkip to conversation

Fix: typo CPPLAGS in examples Makefile

PATCH Mathieu Desnoyers 1 participant 1 message Apr 22, 2019 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Mathieu Desnoyers

author Applied
#1 lore raw

Hi,

Merged into master, and backported to 0.10 and 0.9, thanks!

Mathieu

Quoted 37 lines · ----- On Apr 22, 2019, at 12:04 PM, Michael Jeanson [email protected] wrote:

Overriding CPPFLAGS throught the environment was ignored for the examples.

---
doc/examples/Makefile.am | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
doc/examples/Makefile.am +0 -1
index 3c3d152..edf00eb 100644
@@ -141,7 +141,7 @@ all-local:
 	else \
 		rel_build_subdir="../"; \
 	fi; \
-	$(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPLAGS)"

AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/"

doc/examples/Makefile.am +0 -3
-I"$${rel_src_subdir}/$(top_srcdir)/src/"
-I"$${rel_build_subdir}$(top_builddir)/include/"
-I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)"

AM_CFLAGS="$(AM_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" AM_V_P="$(AM_V_P)" AM_V_at="$(AM_V_at)" $(AM_MAKEFLAGS) all;

doc/examples/Makefile.am +1 -0
+	$(MAKE) -f dist-files/Makefile CC="$(CC)" CPPFLAGS="$(CPPFLAGS)"

AM_CPPFLAGS="$(AM_CPPFLAGS) -I"$${rel_src_subdir}/$(top_srcdir)/include/"

doc/examples/Makefile.am +0 -3
-I"$${rel_src_subdir}/$(top_srcdir)/src/"
-I"$${rel_build_subdir}$(top_builddir)/include/"
-I"$${rel_build_subdir}$(top_builddir)/include/src/"" CFLAGS="$(CFLAGS)"

AM_CFLAGS="$(AM_CFLAGS)" LDFLAGS="$(LDFLAGS)" AM_LDFLAGS="$(AM_LDFLAGS) -L../../../src/.libs/ -Wl,-rpath "$(PWD)/../../src/.libs/"" AM_V_P="$(AM_V_P)" AM_V_at="$(AM_V_at)" $(AM_MAKEFLAGS) all;

clean-local:

	$(AM_V_at)$(MAKE) -f dist-files/Makefile $(AM_MAKEFLAGS) clean; \

--
2.17.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com