PatchSet 6826
Date: 2005/08/14 16:06:15
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Build fixes for Qt4 peers
2005-08-14 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/awt/classpath-qt/Makefile.am
(libqtpeer_la_MOC) Renamed generated moc cpp file to
a header file to avoid having it compiled twice.
(slotcallbacks.moc.cpp) Renamed to
(slotcallbacks.moc.h): New target.
(nodist_libqtpeer_la_SOURCES): New target.
(BUILT_SOURCES) Fixed name of peer library.
* libraries/clib/awt/classpath-qt/slotcallbacks.cpp:
Include slotcallbacks.moc.h rather than slotcallbacks.moc.cpp.
Members:
ChangeLog:1.4350->1.4351
libraries/clib/awt/classpath-qt/Makefile.am:1.1->1.2
libraries/clib/awt/classpath-qt/Makefile.in:1.1->1.2
libraries/clib/awt/classpath-qt/slotcallbacks.cpp:1.1->1.2
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4350 kaffe/ChangeLog:1.4351
--- kaffe/ChangeLog:1.4350 Sun Aug 14 02:05:06 2005
+++ kaffe/ChangeLog Sun Aug 14 16:06:15 2005
@@ -1,3 +1,16 @@
+2005-08-14 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/clib/awt/classpath-qt/Makefile.am
+ (libqtpeer_la_MOC) Renamed generated moc cpp file to
+ a header file to avoid having it compiled twice.
+ (slotcallbacks.moc.cpp) Renamed to
+ (slotcallbacks.moc.h): New target.
+ (nodist_libqtpeer_la_SOURCES): New target.
+ (BUILT_SOURCES) Fixed name of peer library.
+
+ * libraries/clib/awt/classpath-qt/slotcallbacks.cpp:
+ Include slotcallbacks.moc.h rather than slotcallbacks.moc.cpp.
+
2005-08-12 Andreas Tobler <[EMAIL PROTECTED]>
* config/powerpc/ppc_isa.h (REGISTER_SET): Kregs has 7 members,
Index: kaffe/libraries/clib/awt/classpath-qt/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-qt/Makefile.am:1.1
kaffe/libraries/clib/awt/classpath-qt/Makefile.am:1.2
--- kaffe/libraries/clib/awt/classpath-qt/Makefile.am:1.1 Sat Aug 13
15:43:07 2005
+++ kaffe/libraries/clib/awt/classpath-qt/Makefile.am Sun Aug 14 16:06:19 2005
@@ -24,10 +24,13 @@
-release $(PACKAGE_VERSION)
libqtpeer_la_MOC = \
- slotcallbacks.moc.cpp
+ slotcallbacks.moc.h
-slotcallbacks.moc.cpp: slotcallbacks.cpp
- $(MOC) -o slotcallbacks.moc.cpp $(srcdir)/slotcallbacks.cpp
+slotcallbacks.moc.h: slotcallbacks.cpp
+ $(MOC) -o slotcallbacks.moc.h $(srcdir)/slotcallbacks.cpp
+
+nodist_libqtpeer_la_SOURCES = \
+ $(libqtpeer_la_MOC)
libqtpeer_la_SOURCES = \
buttonevent.h \
@@ -82,8 +85,8 @@
qtvolatileimage.cpp \
qtwindowpeer.cpp \
slotcallbacks.cpp \
- slotcallbacks.h
+ slotcallbacks.h
-BUILT_SOURCES = $(libqtawt_la_MOC)
+BUILT_SOURCES = $(libqtpeer_la_MOC)
CLEANFILES = so_locations $(BUILT_SOURCES)
Index: kaffe/libraries/clib/awt/classpath-qt/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-qt/Makefile.in:1.1
kaffe/libraries/clib/awt/classpath-qt/Makefile.in:1.2
--- kaffe/libraries/clib/awt/classpath-qt/Makefile.in:1.1 Sat Aug 13
15:43:07 2005
+++ kaffe/libraries/clib/awt/classpath-qt/Makefile.in Sun Aug 14 16:06:19 2005
@@ -22,7 +22,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-SOURCES = $(libqtpeer_la_SOURCES)
+SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES)
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -108,7 +108,10 @@
libqtpeer_la-qttextareapeer.lo libqtpeer_la-qttextfieldpeer.lo \
libqtpeer_la-qttoolkit.lo libqtpeer_la-qtvolatileimage.lo \
libqtpeer_la-qtwindowpeer.lo libqtpeer_la-slotcallbacks.lo
-libqtpeer_la_OBJECTS = $(am_libqtpeer_la_OBJECTS)
+am__objects_1 =
+nodist_libqtpeer_la_OBJECTS = $(am__objects_1)
+libqtpeer_la_OBJECTS = $(am_libqtpeer_la_OBJECTS) \
+ $(nodist_libqtpeer_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
am__depfiles_maybe = depfiles
@@ -127,7 +130,7 @@
$(AM_CFLAGS) $(CFLAGS)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libqtpeer_la_SOURCES)
+SOURCES = $(libqtpeer_la_SOURCES) $(nodist_libqtpeer_la_SOURCES)
DIST_SOURCES = $(libqtpeer_la_SOURCES)
ETAGS = etags
CTAGS = ctags
@@ -428,7 +431,10 @@
-release $(PACKAGE_VERSION)
libqtpeer_la_MOC = \
- slotcallbacks.moc.cpp
+ slotcallbacks.moc.h
+
+nodist_libqtpeer_la_SOURCES = \
+ $(libqtpeer_la_MOC)
libqtpeer_la_SOURCES = \
buttonevent.h \
@@ -483,9 +489,9 @@
qtvolatileimage.cpp \
qtwindowpeer.cpp \
slotcallbacks.cpp \
- slotcallbacks.h
+ slotcallbacks.h
-BUILT_SOURCES = $(libqtawt_la_MOC)
+BUILT_SOURCES = $(libqtpeer_la_MOC)
CLEANFILES = so_locations $(BUILT_SOURCES)
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1092,8 +1098,8 @@
uninstall-nativeLTLIBRARIES
-slotcallbacks.moc.cpp: slotcallbacks.cpp
- $(MOC) -o slotcallbacks.moc.cpp $(srcdir)/slotcallbacks.cpp
+slotcallbacks.moc.h: slotcallbacks.cpp
+ $(MOC) -o slotcallbacks.moc.h $(srcdir)/slotcallbacks.cpp
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: kaffe/libraries/clib/awt/classpath-qt/slotcallbacks.cpp
diff -u kaffe/libraries/clib/awt/classpath-qt/slotcallbacks.cpp:1.1
kaffe/libraries/clib/awt/classpath-qt/slotcallbacks.cpp:1.2
--- kaffe/libraries/clib/awt/classpath-qt/slotcallbacks.cpp:1.1 Sat Aug 13
15:43:07 2005
+++ kaffe/libraries/clib/awt/classpath-qt/slotcallbacks.cpp Sun Aug 14
16:06:19 2005
@@ -165,7 +165,7 @@
}
};
-#include "slotcallbacks.moc.cpp"
+#include "slotcallbacks.moc.h"
void connectButton(QPushButton *button, JNIEnv *env, jobject buttonobj)
{
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
