[patch] Add stdc++ includes building the qtpeer directory

Fri Jun 16 15:45:00 GMT 2006

We already link against the just built libstdc++, so we can use header
files from the build as well. It's not checked if the qt libraries
are built for a compatible C++ ABI. Ok to checkin?
 Matthias
	* classpath/native/jni/qt-peer/Makefile.am: Add standard C++
	include directores when building the QT peer library.
	* classpath/native/jni/qt-peer/Makefile.in: Regenerate.

--- libjava/classpath/native/jni/qt-peer/Makefile.am~	2006年01月18日 22:50:01.000000000 +0100
+++ libjava/classpath/native/jni/qt-peer/Makefile.am	2006年06月03日 22:08:33.709105528 +0200
@@ -7,7 +7,12 @@
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
-AM_CXXFLAGS = @QT_CFLAGS@
+target_alias
+AM_CXXFLAGS = @QT_CFLAGS@ \
+	-I$(top_builddir)/../../libstdc++-v3/include/$(target_alias) \
+	-I$(top_builddir)/../../libstdc++-v3/include \
+	-I$(top_srcdir)/../../libstdc++-v3/include \
+	-I$(top_srcdir)/../../libstdc++-v3/libsupc++
 
 libqtpeer_la_MOC = \
 	slotcallbacks.moc.h
--- libjava/classpath/native/jni/qt-peer/Makefile.in~	2006年05月31日 02:45:58.000000000 +0200
+++ libjava/classpath/native/jni/qt-peer/Makefile.in	2006年06月03日 22:09:25.954163072 +0200
@@ -306,7 +306,7 @@
 noinst_LTLIBRARIES = libqtpeer.la
 AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
-AM_CXXFLAGS = @QT_CFLAGS@
+AM_CXXFLAGS = @QT_CFLAGS@ -I$(top_builddir)/../../libstdc++-v3/include/$(target_alias) -I$(top_builddir)/../../libstdc++-v3/include -I$(top_srcdir)/../../libstdc++-v3/include -I$(top_srcdir)/../../libstdc++-v3/libsupc++
 libqtpeer_la_MOC = \
 	slotcallbacks.moc.h
 
