diff options
37 files changed, 40 insertions, 40 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a25cc5e8f..53f60b13e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -14,7 +14,7 @@ LIBCVC4_VERSION = @CVC4_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/include -I@srcdir@ -I@builddir@ + -I@builddir@ -I@srcdir@/include -I@srcdir@ AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) SUBDIRS = lib options expr util context theory prop decision smt printer proof . parser compat bindings main diff --git a/src/bindings/Makefile.am b/src/bindings/Makefile.am index bd0bad6ba..fbecad29a 100644 --- a/src/bindings/Makefile.am +++ b/src/bindings/Makefile.am @@ -16,7 +16,7 @@ AUTOMAKE_OPTIONS = subdir-objects AM_CPPFLAGS = \ -D__BUILDING_CVC4BINDINGSLIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall SUBDIRS = compat @@ -217,10 +217,10 @@ if CVC4_HAS_SWIG $(patsubst %,%.cpp,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.cpp: @srcdir@/../cvc4.i $(AM_V_at)mkdir -p $(patsubst %.cpp,%,$@) - $(AM_V_GEN)$(SWIG) -Wall -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -$(patsubst %.cpp,%,$@) -outdir $(patsubst %.cpp,%,$@) $($(subst .,_,$@)_SWIGFLAGS) -o $@ $< + $(AM_V_GEN)$(SWIG) -Wall -I@builddir@/.. -c++ -$(patsubst %.cpp,%,$@) -outdir $(patsubst %.cpp,%,$@) $($(subst .,_,$@)_SWIGFLAGS) -o $@ $< -I@srcdir@/../include -I@srcdir@/.. $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))): %.d: @srcdir@/../cvc4.i - $(AM_V_GEN)$(SWIG) -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -c++ -$(patsubst %.d,%,$@) -MM -o $(patsubst %.d,%.cpp,$@) $< + $(AM_V_GEN)$(SWIG) -I@builddir@/.. -c++ -$(patsubst %.d,%,$@) -MM -o $(patsubst %.d,%.cpp,$@) $< -I@srcdir@/../include -I@srcdir@/.. # .PHONY so they get rebuilt each time .PHONY: .swig_deps $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) .swig_deps: $(patsubst %,%.d,$(filter-out c c++,$(CVC4_LANGUAGE_BINDINGS))) diff --git a/src/bindings/compat/Makefile.am b/src/bindings/compat/Makefile.am index 2aa714458..327da7fae 100644 --- a/src/bindings/compat/Makefile.am +++ b/src/bindings/compat/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4BINDINGSLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall if CVC4_BUILD_LIBCOMPAT diff --git a/src/bindings/compat/c/Makefile.am b/src/bindings/compat/c/Makefile.am index c7298a927..3d9966d41 100644 --- a/src/bindings/compat/c/Makefile.am +++ b/src/bindings/compat/c/Makefile.am @@ -14,7 +14,7 @@ LIBCVC4BINDINGS_VERSION = @CVC4_BINDINGS_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4BINDINGSLIB \ - -I@srcdir@/../../../include -I@srcdir@/../../.. -I@builddir@/../../.. + -I@builddir@/../../.. -I@srcdir@/../../../include -I@srcdir@/../../.. AM_CXXFLAGS = -Wall -Wno-return-type lib_LTLIBRARIES = diff --git a/src/bindings/compat/java/Makefile.am b/src/bindings/compat/java/Makefile.am index 3794775b7..3b0df308a 100644 --- a/src/bindings/compat/java/Makefile.am +++ b/src/bindings/compat/java/Makefile.am @@ -14,8 +14,8 @@ LIBCVC4BINDINGS_VERSION = @CVC4_BINDINGS_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4BINDINGSLIB \ - -I@srcdir@/../../../include -I@srcdir@/../../.. \ - -I@srcdir@/include/cvc3 -I@builddir@/../../.. -I@builddir@/cvc3 + -I@builddir@/../../.. -I@srcdir@/../../../include -I@srcdir@/../../.. \ + -I@builddir@/cvc3 -I@srcdir@/include/cvc3 AM_CXXFLAGS = -Wall javadatadir = $(datadir)/java diff --git a/src/compat/Makefile.am b/src/compat/Makefile.am index 1c2998e94..11dffe9f0 100644 --- a/src/compat/Makefile.am +++ b/src/compat/Makefile.am @@ -14,7 +14,7 @@ LIBCVC4COMPAT_VERSION = @CVC4_COMPAT_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4COMPATLIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. $(ANTLR_INCLUDES) + -I@builddir@/.. $(ANTLR_INCLUDES) -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas if CVC4_BUILD_LIBCOMPAT diff --git a/src/context/Makefile.am b/src/context/Makefile.am index e7f1dc68b..1b78035a9 100644 --- a/src/context/Makefile.am +++ b/src/context/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libcontext.la diff --git a/src/decision/Makefile.am b/src/decision/Makefile.am index 5f62568ee..6d49c6301 100644 --- a/src/decision/Makefile.am +++ b/src/decision/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libdecision.la diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index 0f3a95cdc..bf52da184 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libexpr.la diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index a6ea59e95..dfeab4113 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) diff --git a/src/main/Makefile.am b/src/main/Makefile.am index 952951655..3fb833e6c 100644 --- a/src/main/Makefile.am +++ b/src/main/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4DRIVER \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. $(ANTLR_INCLUDES) + -I@builddir@/.. $(ANTLR_INCLUDES) -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas bin_PROGRAMS = cvc4 diff --git a/src/options/Makefile.am b/src/options/Makefile.am index e81631b09..21988df56 100644 --- a/src/options/Makefile.am +++ b/src/options/Makefile.am @@ -43,7 +43,7 @@ OPTIONS_FILES = \ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = liboptions.la diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am index 82973b32b..7ead35abd 100644 --- a/src/parser/Makefile.am +++ b/src/parser/Makefile.am @@ -14,7 +14,7 @@ LIBCVC4PARSER_VERSION = @CVC4_PARSER_LIBRARY_VERSION@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. $(ANTLR_INCLUDES) + -I@builddir@/.. $(ANTLR_INCLUDES) -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) SUBDIRS = smt1 smt2 cvc tptp diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am index d5ed73ce3..f56eb4cfd 100644 --- a/src/parser/cvc/Makefile.am +++ b/src/parser/cvc/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. $(ANTLR_INCLUDES) + -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable $(WNO_CONVERSION_NULL) # Compile generated C files using C++ compiler diff --git a/src/parser/smt1/Makefile.am b/src/parser/smt1/Makefile.am index 4d7bd551e..66bb1eb8f 100644 --- a/src/parser/smt1/Makefile.am +++ b/src/parser/smt1/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. $(ANTLR_INCLUDES) + -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler diff --git a/src/parser/smt2/Makefile.am b/src/parser/smt2/Makefile.am index 9d84d3da4..ed60ad1ea 100644 --- a/src/parser/smt2/Makefile.am +++ b/src/parser/smt2/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. $(ANTLR_INCLUDES) + -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler diff --git a/src/parser/tptp/Makefile.am b/src/parser/tptp/Makefile.am index e0010650a..45fdf9df9 100644 --- a/src/parser/tptp/Makefile.am +++ b/src/parser/tptp/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4PARSERLIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. $(ANTLR_INCLUDES) + -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable # Compile generated C files using C++ compiler diff --git a/src/printer/Makefile.am b/src/printer/Makefile.am index 21997d2dc..fd48b8352 100644 --- a/src/printer/Makefile.am +++ b/src/printer/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libprinter.la diff --git a/src/proof/Makefile.am b/src/proof/Makefile.am index 7588f0dc3..75588ceb8 100644 --- a/src/proof/Makefile.am +++ b/src/proof/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -I@srcdir@/../prop/minisat + -I@builddir@/.. -I@srcdir@/../prop/minisat -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libproof.la diff --git a/src/prop/Makefile.am b/src/prop/Makefile.am index f109e0ed2..6b8221443 100644 --- a/src/prop/Makefile.am +++ b/src/prop/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. -I@srcdir@/minisat -I@srcdir@/bvminisat + -I@builddir@/.. -I@srcdir@/minisat -I@srcdir@/bvminisat -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libprop.la diff --git a/src/prop/bvminisat/Makefile.am b/src/prop/bvminisat/Makefile.am index 685dfac7d..d34a4c12c 100644 --- a/src/prop/bvminisat/Makefile.am +++ b/src/prop/bvminisat/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ - -I@srcdir@/ -I@srcdir@/../.. -I@builddir@/../.. -I@srcdir@/../../include + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/ -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbvminisat.la diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am index 045cc3616..4c110980d 100644 --- a/src/prop/minisat/Makefile.am +++ b/src/prop/minisat/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ - -I@srcdir@/ -I@srcdir@/../.. -I@builddir@/../.. -I@srcdir@/../../include + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/ -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-parentheses -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libminisat.la diff --git a/src/smt/Makefile.am b/src/smt/Makefile.am index 75f17326d..45c2e4924 100644 --- a/src/smt/Makefile.am +++ b/src/smt/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libsmt.la diff --git a/src/theory/Makefile.am b/src/theory/Makefile.am index 1362b1f5c..b30a399e4 100644 --- a/src/theory/Makefile.am +++ b/src/theory/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) SUBDIRS = builtin booleans uf arith arrays bv datatypes quantifiers rewriterules diff --git a/src/theory/arith/Makefile.am b/src/theory/arith/Makefile.am index b2d1b9f09..3b3c9549e 100644 --- a/src/theory/arith/Makefile.am +++ b/src/theory/arith/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libarith.la diff --git a/src/theory/arrays/Makefile.am b/src/theory/arrays/Makefile.am index be3f25ef5..ec834522f 100644 --- a/src/theory/arrays/Makefile.am +++ b/src/theory/arrays/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libarrays.la diff --git a/src/theory/booleans/Makefile.am b/src/theory/booleans/Makefile.am index a68ee62cd..8cb32de18 100644 --- a/src/theory/booleans/Makefile.am +++ b/src/theory/booleans/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbooleans.la diff --git a/src/theory/builtin/Makefile.am b/src/theory/builtin/Makefile.am index ad471bae7..6ff00feb6 100644 --- a/src/theory/builtin/Makefile.am +++ b/src/theory/builtin/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbuiltin.la diff --git a/src/theory/bv/Makefile.am b/src/theory/bv/Makefile.am index 669cbe9e0..ab6382770 100644 --- a/src/theory/bv/Makefile.am +++ b/src/theory/bv/Makefile.am @@ -2,7 +2,7 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libbv.la diff --git a/src/theory/datatypes/Makefile.am b/src/theory/datatypes/Makefile.am index 323e18de9..8b788b73b 100644 --- a/src/theory/datatypes/Makefile.am +++ b/src/theory/datatypes/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libdatatypes.la diff --git a/src/theory/example/Makefile.am b/src/theory/example/Makefile.am index 4d08f7a69..801a048a8 100644 --- a/src/theory/example/Makefile.am +++ b/src/theory/example/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libexample.la diff --git a/src/theory/quantifiers/Makefile.am b/src/theory/quantifiers/Makefile.am index 316af7616..7fea8cf3a 100644 --- a/src/theory/quantifiers/Makefile.am +++ b/src/theory/quantifiers/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libquantifiers.la diff --git a/src/theory/rewriterules/Makefile.am b/src/theory/rewriterules/Makefile.am index 1b137e7f0..a1e5771b9 100644 --- a/src/theory/rewriterules/Makefile.am +++ b/src/theory/rewriterules/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = librewriterules.la diff --git a/src/theory/uf/Makefile.am b/src/theory/uf/Makefile.am index 82129c72b..50c508092 100644 --- a/src/theory/uf/Makefile.am +++ b/src/theory/uf/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../../include -I@srcdir@/../.. -I@builddir@/../.. + -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libuf.la diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 804bcde11..dffb22ea8 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,6 +1,6 @@ AM_CPPFLAGS = \ -D__BUILDING_CVC4LIB \ - -I@srcdir@/../include -I@srcdir@/.. -I@builddir@/.. + -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) noinst_LTLIBRARIES = libutil.la libutilcudd.la libstatistics.la diff --git a/test/system/Makefile.am b/test/system/Makefile.am index 0cd633dc6..e8e3f8c87 100644 --- a/test/system/Makefile.am +++ b/test/system/Makefile.am @@ -63,10 +63,10 @@ endif AM_CPPFLAGS = \ -I. \ + "-I@top_builddir@/src" \ "-I@top_srcdir@/src/include" \ "-I@top_srcdir@/lib" \ "-I@top_srcdir@/src" \ - "-I@top_builddir@/src" \ "-I@top_srcdir@/src/prop/minisat" \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am index a287b7520..a5530ab6d 100644 --- a/test/unit/Makefile.am +++ b/test/unit/Makefile.am @@ -68,10 +68,10 @@ if HAVE_CXXTESTGEN AM_CPPFLAGS = \ -I. \ "-I@CXXTEST@" \ + "-I@top_builddir@/src" \ "-I@top_srcdir@/src/include" \ "-I@top_srcdir@/lib" \ "-I@top_srcdir@/src" \ - "-I@top_builddir@/src" \ "-I@top_srcdir@/src/prop/minisat" \ -D __STDC_LIMIT_MACROS \ -D __STDC_FORMAT_MACROS \ |