summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/Makefile.am6
-rw-r--r--src/bindings/compat/Makefile.am2
-rw-r--r--src/bindings/compat/c/Makefile.am2
-rw-r--r--src/bindings/compat/java/Makefile.am4
4 files changed, 7 insertions, 7 deletions
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
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback