Minor fixes to build system

diff --git a/src/parser/cvc/Makefile.am b/src/parser/cvc/Makefile.am
index f56eb4cfd1a8c761bea99e2541c6b4dd8b6fb5a3..b1cfe7bd80c3f7090894e75abad26e24fb0f57c5 100644 (file)
--- a/src/parser/cvc/Makefile.am
+++ b/src/parser/cvc/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
-       -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../..
+       -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
 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 66bb1eb8f2a0635bc8e92aff3fa9634222d98c14..578fae272c96eabeaf113aaa916e2c0ccad478ee 100644 (file)
--- a/src/parser/smt1/Makefile.am
+++ b/src/parser/smt1/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
-       -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../..
+       -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
 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 ed60ad1ea34536944c783f3b27568b0d3b3080b8..ec445427a2eae2260b96e5f202d944384dd67a7f 100644 (file)
--- a/src/parser/smt2/Makefile.am
+++ b/src/parser/smt2/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
-       -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../..
+       -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
 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 45fdf9df95100a740def3169c2e149d366398551..0db7773b2a89ff967f4c11971ccaa3476aaf9cc9 100644 (file)
--- a/src/parser/tptp/Makefile.am
+++ b/src/parser/tptp/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = \
        -D__BUILDING_CVC4PARSERLIB \
-       -I@builddir@/../.. $(ANTLR_INCLUDES) -I@srcdir@/../../include -I@srcdir@/../..
+       -I@builddir@/../.. -I@srcdir@/../../include -I@srcdir@/../.. $(ANTLR_INCLUDES)
 AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -Wno-unused-function -Wno-unused-variable
 
 # Compile generated C files using C++ compiler