fix to build system: #include the proper file when they are in both builds and src

diff --git a/src/Makefile.am b/src/Makefile.am
index a25cc5e8f7489ca87789a7e1ee31452c5b5f5919..53f60b13e285d38bde90a203c8d6f7228ecc9c61 100644 (file)
--- 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 bd0bad6ba874002e86bb2c1800e370b8bfe004b3..fbecad29a7edf95a2397a9253b6a251f27804b0e 100644 (file)
--- 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 2aa714458d9242bcf1940aea2a109c7518c48676..327da7faeeb4f30926e8feb926befd3fd02495fe 100644 (file)
--- 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 c7298a92745124409b5678482621b0caf651ab33..3d9966d416cda5a0d8eddb52ee84807a10a70be4 100644 (file)
--- 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 3794775b772b7012cb4d9d471b7d3c3bfd464b59..3b0df308a1e769ee9b3b2585a8e630bae24f83b5 100644 (file)
--- 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 1c2998e94e52ad4f8493d395ef4afe007bf75d0c..11dffe9f0a90e0423d4224c20d58ade95d0f5bfb 100644 (file)
--- 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 e7f1dc68bbb0a1c93f80cdc58361e28e11fb3522..1b78035a995fd6bb1de5488689eb89c07219a02f 100644 (file)
--- 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 5f62568eec2f8222645bceb0e3daccfd6b2b6be1..6d49c6301d942968ef086632d7f6ff61ce2ad3c0 100644 (file)
--- 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 0f3a95cdc21958ccb9f9be762b954cd7fd242e02..bf52da184724285dad2a921d9d36be27751a82d5 100644 (file)
--- 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 a6ea59e95467a5ea0c8a399e41c1e57230064f7c..dfeab4113a106052f84fcd8dc5de9a15f935f5df 100644 (file)
--- 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 952951655132eeceeb5efcb9c49a2c07ef294bd0..3fb833e6c6ff563e839561b530c5eb351a134fec 100644 (file)
--- 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 e81631b09beb8d00153d7cf6cc022bdcaa5d8642..21988df565887c73b21f195422452560822ec6a4 100644 (file)
--- 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 82973b32ba2ff4b44cd765e9f2ef8d7b3e5e791f..7ead35abd5abfbe1f590d33cab8e76d5b5913ea3 100644 (file)
--- 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 d5ed73ce30abfade4e62d1ffcd1452ac63c30203..f56eb4cfd1a8c761bea99e2541c6b4dd8b6fb5a3 100644 (file)
--- 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 4d7bd551ebf6086d068a19563301c35fdb12cd56..66bb1eb8f2a0635bc8e92aff3fa9634222d98c14 100644 (file)
--- 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 9d84d3da4975e6b0073ffc5cbdd7f8510997c4c3..ed60ad1ea34536944c783f3b27568b0d3b3080b8 100644 (file)
--- 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 e0010650a50e326f37f8cbc62b9032892554219e..45fdf9df95100a740def3169c2e149d366398551 100644 (file)
--- 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 21997d2dc7b36e6d0b026b7f724dfac78ad8dd8c..fd48b8352d5762b93647db7937acd081760b3b12 100644 (file)
--- 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 7588f0dc37b6f52e3b2c9f831d0bab0710f49835..75588ceb820706caaa26a1ed6b27dbb7392bc527 100644 (file)
--- 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 f109e0ed28a6c72e319e17336135529ca0d869fa..6b822144327cab2f69fdf3392638d56e1e301fe5 100644 (file)
--- 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 685dfac7d4c4a6011b3cfa8bbfaa403ad811e361..d34a4c12c35f0bdcc1e0079360ac21eabe789189 100644 (file)
--- 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 045cc3616b678fecb3863cce5a2805e228826386..4c110980df7ef2899b91651cb5793ecd112e7ce0 100644 (file)
--- 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 75f17326dfe84001b1d707a2153462a32d7c590a..45c2e4924ec1c8635798ed9f2ce7459f0f2dc6e0 100644 (file)
--- 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 1362b1f5cd3f4bfce7736c17b56458674ef0fe8c..b30a399e4a921b1b7779f5ad5c3f6739348215e9 100644 (file)
--- 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 b2d1b9f09a6101ae90e197a567409c8a59f095e2..3b3c9549eb361f4d62f98028235804d8775e3771 100644 (file)
--- 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 be3f25ef5e89a50c0bab67db491b745c55e6a9a0..ec834522f01de02da25a3392b0b311e043f90a75 100644 (file)
--- 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 a68ee62cddabd92ebbf0f1f6414e3706bd51aac5..8cb32de18a677a79b17638c1fc2a011de82430e5 100644 (file)
--- 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 ad471bae71589a246082b1e2812e20ed0883dd67..6ff00feb640bad7b8aa522eb42d033ef96513e5a 100644 (file)
--- 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 669cbe9e0637d8d5f69c76f06553f8f950a5211c..ab638277069664646a9db3b4c0d2c76d8a6ad093 100644 (file)
--- 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 323e18de9e3f2fc08a326b5a3410ad482be7db8f..8b788b73b386e8d67a19fdf899ea178740da49b5 100644 (file)
--- 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 4d08f7a6947aad704d6688733755016f59aa6c20..801a048a82cd428238c13015d722423a6c5644e4 100644 (file)
--- 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 316af7616c23b0f148974b1b539c9ecf39f6b4d4..7fea8cf3abe0323eab3cefba2effc6b7b6756c59 100644 (file)
--- 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 1b137e7f0c33afe47b78ae3c8c573e10637c05d7..a1e5771b98fa0ad65a9bdf9b364cc640ac4cf65a 100644 (file)
--- 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 82129c72b34e7e87f1dc4d394bb660c27e561bf9..50c50809276c26cc7606fca2e88a791259fe023c 100644 (file)
--- 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 804bcde119dd40f083562aa01f420561519fc428..dffb22ea8caf4d69cd0dc1c6351371a9d2704c00 100644 (file)
--- 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 0cd633dc67a54691866d5e089fbfcb2252b4cfab..e8e3f8c87c0eeef488898677aa8fd22815ada2b7 100644 (file)
--- 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 a287b752076fe874d6498baa1a6f767caa65896a..a5530ab6d103cea66da3fc0d971ec466fa31cdb7 100644 (file)
--- 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 \