Merge pull request #46 from fd00/fix-make

Fix `make` on `srcdir != builddir`
fragglet · Jul 29, 2023 · 9676231 · 9676231
2 parents 3d64e21 + 7ad404d
commit 9676231
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,11 +10,11 @@ SOURCE_FILES=                             \
 	safe.c        safe.h
 
 lha_SOURCES=$(SOURCE_FILES)
-lha_CFLAGS=$(MAIN_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir)
+lha_CFLAGS=$(MAIN_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir) -I$(top_srcdir)/lib/public -I$(top_srcdir)
 lha_LDADD=$(top_builddir)/lib/liblhasa.la
 
 test_lha_SOURCES=$(SOURCE_FILES)
-test_lha_CFLAGS=$(TEST_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir)
+test_lha_CFLAGS=$(TEST_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir) -I$(top_srcdir)/lib/public -I$(top_srcdir)
 test_lha_LDADD=$(top_builddir)/lib/liblhasatest.a
 
 clean-local:

diff --git a/test/Makefile.am b/test/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CFLAGS=$(TEST_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir) -g
+AM_CFLAGS=$(TEST_CFLAGS) -I$(top_builddir)/lib/public -I$(top_builddir) -g -I$(top_srcdir)/lib/public -I$(top_srcdir)
 LDADD=$(top_builddir)/lib/liblhasatest.a libtestframework.a
 
 COMPILED_TESTS=                       \