Kelson has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/295111 )
Change subject: Include files from srcdir; built files in builddir. ...................................................................... Include files from srcdir; built files in builddir. Change-Id: I84f097567b944601534cdbc3313216c0364211bd --- M zimlib/examples/Makefile.am M zimlib/src/Makefile.am M zimlib/src/tools/Makefile.am M zimlib/test/Makefile.am M zimreader/src/Makefile.am M zimwriterdb/src/Makefile.am M zimwriterdb/test/Makefile.am 7 files changed, 7 insertions(+), 7 deletions(-) Approvals: Kelson: Verified; Looks good to me, approved diff --git a/zimlib/examples/Makefile.am b/zimlib/examples/Makefile.am index 13ac63f..3157cf0 100644 --- a/zimlib/examples/Makefile.am +++ b/zimlib/examples/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include noinst_PROGRAMS = createZimExample createZimExample_SOURCES = createZimExample.cpp LDADD = $(top_builddir)/src/libzim.la diff --git a/zimlib/src/Makefile.am b/zimlib/src/Makefile.am index 823a3b6..c0bd632 100644 --- a/zimlib/src/Makefile.am +++ b/zimlib/src/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include lib_LTLIBRARIES = libzim.la diff --git a/zimlib/src/tools/Makefile.am b/zimlib/src/tools/Makefile.am index a50b7c8..410504a 100644 --- a/zimlib/src/tools/Makefile.am +++ b/zimlib/src/tools/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include -I$(top_srcdir)/src if MAKE_BENCHMARK ZIMBENCH = zimbench endif diff --git a/zimlib/test/Makefile.am b/zimlib/test/Makefile.am index 34dad12..29dd7bd 100644 --- a/zimlib/test/Makefile.am +++ b/zimlib/test/Makefile.am @@ -1,4 +1,4 @@ -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include noinst_PROGRAMS = zimlib-test diff --git a/zimreader/src/Makefile.am b/zimreader/src/Makefile.am index ff40f97..b7fc747 100644 --- a/zimreader/src/Makefile.am +++ b/zimreader/src/Makefile.am @@ -10,7 +10,7 @@ .css.cpp: ecppc $(ECPPFLAGS) -b $(ECPPFLAGS_CSS) $< -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include bin_PROGRAMS = zimreader diff --git a/zimwriterdb/src/Makefile.am b/zimwriterdb/src/Makefile.am index 46b0fac..854f2cb 100644 --- a/zimwriterdb/src/Makefile.am +++ b/zimwriterdb/src/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = zimwriterdb zimindexer zimcreatorsearch wikizim -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include # wikizim # diff --git a/zimwriterdb/test/Makefile.am b/zimwriterdb/test/Makefile.am index fffe02a..52262b2 100644 --- a/zimwriterdb/test/Makefile.am +++ b/zimwriterdb/test/Makefile.am @@ -6,4 +6,4 @@ createzim_t_LDFLAGS = -lcxxtools -lzim createzim_t_SOURCES = createzim-t.cpp -AM_CPPFLAGS=-I$(top_builddir)/include +AM_CPPFLAGS=-I$(top_srcdir)/include -- To view, visit https://gerrit.wikimedia.org/r/295111 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84f097567b944601534cdbc3313216c0364211bd Gerrit-PatchSet: 2 Gerrit-Project: openzim Gerrit-Branch: master Gerrit-Owner: C. Scott Ananian <canan...@wikimedia.org> Gerrit-Reviewer: Kelson <kel...@kiwix.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits