---- gcc/libjava/classpath/native/jni/qt-peer/componentevent.cpp.ark 2005-11-02 22:57:59.000000000 +0100
-+++ gcc/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2005-11-02 22:58:07.000000000 +0100
-@@ -38,6 +38,8 @@
- #include <QWidget>
- #include <QPoint>
+--- trunk/libjava/classpath/configure.ac 2006-07-02 15:32:04.000000000 +0200
++++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200
+@@ -502,7 +502,8 @@
+ AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
+ QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
+ AC_MSG_WARN([QWidget not found])))
+- AC_CHECK_PROG(MOC, [moc], [moc])
++ QT4DIR=`$PKG_CONFIG --variable=prefix QtGui`
++ AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin)
+ AC_CHECK_PROG(MOC, [moc-qt4], [moc-qt4])
+ fi
+ if test "x$HAVE_QT4" = "xno"; then
+--- trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2007-06-04 01:18:43.000000000 +0200
++++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2008-03-06 16:32:36.000000000 +0100
+@@ -1,8 +1,7 @@
+ # Qt AWT backend for Classpath
+ #
-+#include <assert.h>
+-## GCJ LOCAL: don't install this library
+-noinst_LTLIBRARIES = libqtpeer.la
++nativeexeclib_LTLIBRARIES = libqtpeer.la
+
+ AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
+ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+--- trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2007-08-04 12:53:49.000000000 +0200
++++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2008-03-06 15:24:38.000000000 +0100
+@@ -64,7 +64,8 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/../../mkinstalldirs
+ CONFIG_HEADER = $(top_builddir)/include/config.h
+ CONFIG_CLEAN_FILES =
+-LTLIBRARIES = $(noinst_LTLIBRARIES)
++nativeexeclibLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(nativeexeclib_LTLIBRARIES)
+ libqtpeer_la_LIBADD =
+ am_libqtpeer_la_OBJECTS = componentevent.lo keybindings.lo \
+ mainqtthread.lo mainthreadinterface.lo nativewrapper.lo \
+@@ -357,7 +358,7 @@
+ target_vendor = @target_vendor@
+ toolexeclibdir = @toolexeclibdir@
+ vm_classes = @vm_classes@
+-noinst_LTLIBRARIES = libqtpeer.la
++nativeexeclib_LTLIBRARIES = libqtpeer.la
+ AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
+ AM_CPPFLAGS = @CLASSPATH_INCLUDES@
+ AM_CXXFLAGS = @QT_CFLAGS@ \
+@@ -475,7 +476,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libqtpeer.la: $(libqtpeer_la_OBJECTS) $(libqtpeer_la_DEPENDENCIES)
+- $(CXXLINK) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
++ $(LINK) -rpath $(nativeexeclibdir) $(libqtpeer_la_LDFLAGS) $(libqtpeer_la_OBJECTS) $(libqtpeer_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -686,7 +687,18 @@
+
+ install-data-am:
+
+-install-exec-am:
++install-nativeexeclibLTLIBRARIES: $(nativeexeclib_LTLIBRARIES)
++ @$(NORMAL_INSTALL)
++ test -z "$(nativeexeclibdir)" || $(mkdir_p) "$(DESTDIR)$(nativeexeclibdir)"
++ @list='$(nativeexeclib_LTLIBRARIES)'; for p in $$list; do \
++ if test -f $$p; then \
++ f=$(am__strip_dir) \
++ echo " $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(nativeexeclibdir)/$$f'"; \
++ $(LIBTOOL) --mode=install $(nativeexeclibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(nativeexeclibdir)/$$f"; \
++ else :; fi; \
++ done
+
- #include "componentevent.h"
-
- AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent()
---- gcc/libjava/classpath/configure.ac.ark 2005-11-02 23:02:44.000000000 +0100
-+++ gcc/libjava/classpath/configure.ac 2005-11-02 23:06:39.000000000 +0100
-@@ -311,6 +311,7 @@
- AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
- QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
- AC_MSG_WARN([QWidget not found])))
-+ QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++"
- AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
- AC_CHECK_PROG(MOC, [moc], [moc])
- AC_SUBST(QT_CFLAGS)
---- gcc/libjava/classpath/configure.ark 2005-11-02 23:03:14.000000000 +0100
-+++ gcc/libjava/classpath/configure 2005-11-02 23:05:47.000000000 +0100
-@@ -10661,7 +10661,7 @@
- fi
++install-exec-am: install-nativeexeclibLTLIBRARIES
- fi
--
-+QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++"
- { echo "$as_me:$LINENO: Set QT_CFLAGS... $QT_CFLAGS" >&5
- echo "$as_me: Set QT_CFLAGS... $QT_CFLAGS" >&6;}
- # Extract the first word of "moc", so it can be a program name with args.
---- gcc/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.ark 2005-11-03 09:57:52.000000000 +0100
-+++ gcc/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2005-11-03 09:58:05.000000000 +0100
-@@ -135,7 +135,7 @@
- {
- eventQueue = new EventQueue();
- repaintThread = new QtRepaintThread();
-- System.loadLibrary("qtpeer");
-+ System.loadLibrary("-gnu-java-awt-peer-qt");
+ install-info: install-info-am
- String theme = null;
- try
+@@ -720,6 +732,7 @@
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
++ install-nativeexeclibLTLIBRARIES \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
projects / packages / gcc.git / blobdiff