diff --git a/regress/gtest/Makefile.am b/regress/gtest/Makefile.am index b8ab6bd..f0e3fdf 100644 --- a/regress/gtest/Makefile.am +++ b/regress/gtest/Makefile.am @@ -5,7 +5,7 @@ # google test library GTEST_OBJS = gtest-1.6.0/src/gtest-all.cc -GTEST_INCLUDE = -Igtest-1.6.0/include/gtest -Igtest-1.6.0/include -Igtest-1.6.0 +GTEST_INCLUDE = -I$(srcdir)/gtest-1.6.0/include/gtest -I$(srcdir)/gtest-1.6.0/include -I$(srcdir)/gtest-1.6.0 GTEST_CXXFLAGS = -Dprivate=public -Dprotected=public @@ -45,7 +45,7 @@ GTEST_EXTRA_FILES = gtest-1.6.0/src/gtest-internal-inl.h \ # simulavr bindings SIMULAVR_PATH = ../.. -SIMULAVR_INCLUDE = -I$(SIMULAVR_PATH)/src +SIMULAVR_INCLUDE = -I$(top_srcdir)/src SIMULAVR_LIB = $(SIMULAVR_PATH)/src/.libs/libsim.la # design under test settings diff --git a/src/Makefile.am b/src/Makefile.am index c8b98e7..cff7d50 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ endif endif -AM_CXXFLAGS=-Ielfio -g -O2 -fPIC -Icmd -Iui -Ihwtimer +AM_CXXFLAGS=-I$(srcdir)/elfio -g -O2 -fPIC -I$(srcdir)/cmd -I$(srcdir)/ui -I$(srcdir)/hwtimer bin_PROGRAMS = simulavr @MAINT@ noinst_PROGRAMS = kbdgentables