diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-14 17:16:02 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-03-14 17:16:02 -0400 |
commit | d242c3088885a2d02679e34560a8fe8a1d6a86ea (patch) | |
tree | 6902d003de4e12af79778dbfc6935fdca404aa64 /src/parser | |
parent | 8eb02754af2dbef5b3704d6674e8b7376f07f8a1 (diff) |
fix to build system: #include the proper file when they are in both builds and src
Diffstat (limited to 'src/parser')
-rw-r--r-- | src/parser/Makefile.am | 2 | ||||
-rw-r--r-- | src/parser/cvc/Makefile.am | 2 | ||||
-rw-r--r-- | src/parser/smt1/Makefile.am | 2 | ||||
-rw-r--r-- | src/parser/smt2/Makefile.am | 2 | ||||
-rw-r--r-- | src/parser/tptp/Makefile.am | 2 |
5 files changed, 5 insertions, 5 deletions
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 |