From: Marcus Comstedt <redacted>
Date: Sun, 31 Aug 2014 08:49:02 +0000 (+0200)
Subject: Makefile.am: Use $(CXXCOMPILE) to compile C++ code
X-Git-Tag: libsigrok-0.4.0~1066
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d1a5f737816cd9bc8d4ddfeb6d8831a1c1c58bf9;p=libsigrok.git

Makefile.am: Use $(CXXCOMPILE) to compile C++ code

When compiling the SWIG wrappers for the Java bindings, use the correct
automake macro so that all compiler flags are honoured.
---

diff --git a/Makefile.am b/Makefile.am
index 3087649c..e5495755 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -523,7 +523,7 @@ $(JJAR): $(JCXX)
 	$(AM_V_at)jar cf $(JJAR) -C $(JDIR) $(JPKG)
 
 $(JLIB): $(JCXX) bindings/cxx/libsigrokxx.la $(library_include_HEADERS)
-	$(AM_V_GEN)$(CXX) $(CXXFLAGS) -L.libs -Lbindings/cxx/.libs \
+	$(AM_V_GEN)$(CXXCOMPILE) -L.libs -Lbindings/cxx/.libs \
 		-fno-strict-aliasing -fPIC -shared $(JCLS)/classes_wrap.cxx \
 		-lsigrokxx -o $(JLIB)