PatchSet 5013
Date: 2004/07/25 07:59:49
Author: guilhem
Branch: HEAD
Tag: (none)
Log:
Removed AWT's and libxmlj's classes from the bootstrap file.
2004-07-25 Helmer Krämer <[EMAIL PROTECTED]>
* include/Makefile.am
(NOINSTALL_JNI_DERIVED_HDRS): Removed libxmlj's and awt's
headers. Removed duplicates of tritonus' headers.
(LIBGTKPEER_JNI_HDRS): Added AWT headers to be generated
after rt.jar build.
(LIBXMLJ_JNI_HDRS): Updated with new libxml's headers.
(stamp-libgtkpeer): New target to build the gtkpeer's headers
after rt.jar build.
* libraries/clib/Makefile.am
(SUBDIRS): Removed awt and libxmlj
* libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
(libgtkpeer_headers): Invoke include's Makefile to build
the JNI headers.
* libraries/javalib/bootstrap.classlist:
Removed all AWT and xmlj classes.
* include/Makefile.in, libraries/clib/Makefile.in,
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
libraries/javalib/Klasses.jar.bootstrap:
Regenerated.
Members:
ChangeLog:1.2572->1.2573
include/Makefile.am:1.65->1.66
include/Makefile.in:1.175->1.176
libraries/clib/Makefile.am:1.10->1.11
libraries/clib/Makefile.in:1.117->1.118
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.1->1.2
libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.2->1.3
libraries/javalib/Klasses.jar.bootstrap:1.65->1.66
libraries/javalib/bootstrap.classlist:1.55->1.56
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2572 kaffe/ChangeLog:1.2573
--- kaffe/ChangeLog:1.2572 Sun Jul 25 07:49:58 2004
+++ kaffe/ChangeLog Sun Jul 25 07:59:49 2004
@@ -1,3 +1,29 @@
+2004-07-25 Helmer Krämer <[EMAIL PROTECTED]>
+
+ * include/Makefile.am
+ (NOINSTALL_JNI_DERIVED_HDRS): Removed libxmlj's and awt's
+ headers. Removed duplicates of tritonus' headers.
+ (LIBGTKPEER_JNI_HDRS): Added AWT headers to be generated
+ after rt.jar build.
+ (LIBXMLJ_JNI_HDRS): Updated with new libxml's headers.
+ (stamp-libgtkpeer): New target to build the gtkpeer's headers
+ after rt.jar build.
+
+ * libraries/clib/Makefile.am
+ (SUBDIRS): Removed awt and libxmlj
+
+ * libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:
+ (libgtkpeer_headers): Invoke include's Makefile to build
+ the JNI headers.
+
+ * libraries/javalib/bootstrap.classlist:
+ Removed all AWT and xmlj classes.
+
+ * include/Makefile.in, libraries/clib/Makefile.in,
+ libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in,
+ libraries/javalib/Klasses.jar.bootstrap:
+ Regenerated.
+
2004-07-25 Guilhem Lavaux <[EMAIL PROTECTED]>
* java/awt/image/ByteLookupTable.java,
Index: kaffe/include/Makefile.am
diff -u kaffe/include/Makefile.am:1.65 kaffe/include/Makefile.am:1.66
--- kaffe/include/Makefile.am:1.65 Thu Jul 22 19:03:31 2004
+++ kaffe/include/Makefile.am Sun Jul 25 07:59:52 2004
@@ -105,54 +105,6 @@
INSTALL_JNI_DERIVED_HDRS =
NOINSTALL_JNI_DERIVED_HDRS = \
- gnu_java_awt_peer_gtk_GdkFontMetrics.h \
- gnu_java_awt_peer_gtk_GdkGraphics.h \
- gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
- gnu_java_awt_peer_gtk_GtkButtonPeer.h \
- gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
- gnu_java_awt_peer_gtk_GtkChoicePeer.h \
- gnu_java_awt_peer_gtk_GtkClipboard.h \
- gnu_java_awt_peer_gtk_GtkComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
- gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
- gnu_java_awt_peer_gtk_GtkFramePeer.h \
- gnu_java_awt_peer_gtk_GtkGenericPeer.h \
- gnu_java_awt_peer_gtk_GtkImagePainter.h \
- gnu_java_awt_peer_gtk_GtkLabelPeer.h \
- gnu_java_awt_peer_gtk_GtkListPeer.h \
- gnu_java_awt_peer_gtk_GtkMainThread.h \
- gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkPanelPeer.h \
- gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
- gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
- gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
- gnu_java_awt_peer_gtk_GtkToolkit.h \
- gnu_java_awt_peer_gtk_GtkWindowPeer.h \
- gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h \
- gnu_xml_libxmlj_dom_GnomeAttr.h \
- gnu_xml_libxmlj_dom_GnomeDocument.h \
- gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h \
- gnu_xml_libxmlj_dom_GnomeDocumentType.h \
- gnu_xml_libxmlj_dom_GnomeElement.h \
- gnu_xml_libxmlj_dom_GnomeEntity.h \
- gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h \
- gnu_xml_libxmlj_dom_GnomeNode.h \
- gnu_xml_libxmlj_dom_GnomeNodeList.h \
- gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \
- gnu_xml_libxmlj_dom_MatchingNodeList.h \
- gnu_xml_libxmlj_sax_GnomeLocator.h \
- gnu_xml_libxmlj_sax_GnomeXMLReader.h \
- gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
java_math_BigInteger.h \
gnu_java_nio_channels_FileChannelImpl.h \
gnu_java_nio_NIOServerSocket.h \
@@ -204,10 +156,6 @@
org_tritonus_lowlevel_esd_Esd.h \
org_tritonus_lowlevel_esd_EsdRecordingStream.h \
org_tritonus_lowlevel_esd_EsdSample.h \
- org_tritonus_lowlevel_esd_EsdStream.h \
- org_tritonus_lowlevel_esd_Esd.h \
- org_tritonus_lowlevel_esd_EsdRecordingStream.h \
- org_tritonus_lowlevel_esd_EsdSample.h \
org_tritonus_lowlevel_esd_EsdStream.h
@@ -226,10 +174,42 @@
gnu_xml_libxmlj_sax_GnomeLocator.h \
gnu_xml_libxmlj_sax_GnomeXMLReader.h \
gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_TransformerFactoryImpl.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
- gnu_xml_libxmlj_transform_LibxmlDocument.h
+ gnu_xml_libxmlj_transform_JavaContext.h
+LIBGTKPEER_JNI_HDRS = \
+ gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+ gnu_java_awt_peer_gtk_GdkGraphics.h \
+ gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
+ gnu_java_awt_peer_gtk_GtkButtonPeer.h \
+ gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
+ gnu_java_awt_peer_gtk_GtkChoicePeer.h \
+ gnu_java_awt_peer_gtk_GtkClipboard.h \
+ gnu_java_awt_peer_gtk_GtkComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
+ gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
+ gnu_java_awt_peer_gtk_GtkFramePeer.h \
+ gnu_java_awt_peer_gtk_GtkGenericPeer.h \
+ gnu_java_awt_peer_gtk_GtkImagePainter.h \
+ gnu_java_awt_peer_gtk_GtkLabelPeer.h \
+ gnu_java_awt_peer_gtk_GtkListPeer.h \
+ gnu_java_awt_peer_gtk_GtkMainThread.h \
+ gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkPanelPeer.h \
+ gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
+ gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
+ gnu_java_awt_peer_gtk_GtkToolkit.h \
+ gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
if USE_COMPAT_IFADDRS
ifaddrs_compat = ifaddrs.h
@@ -325,7 +305,6 @@
rm -f $$f; mv stamp-h1$$f $$f; \
fi; \
done
- @echo timestamp > $@
#
@@ -338,40 +317,67 @@
stamp-h1all: HDRS = $(JNI_DERIVED_HDRS)
stamp-h1all: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for alsa backend of tritonus
#
-libtritonusalsa_headers: stamp-libtritonusalsa
+.PHONY:libtritonusalsa_headers
+libtritonusalsa_headers: $(LIBTRITONUSALSA_JNI_HDRS)
+
+$(LIBTRITONUSALSA_JNI_HDRS): stamp-libtritonusalsa
@if test -f $@; then :; else \
- rm -f stamp-libtritonusalsa; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusalsa; \
+ rm -f stamp-libtritonusalsa; $(MAKE) stamp-libtritonusalsa; \
fi
stamp-libtritonusalsa: HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
stamp-libtritonusalsa: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for esd backend of tritonus
#
-libtritonusesd_headers: stamp-libtritonusesd
+.PHONY:libtritonusesd_headers
+libtritonusesd_headers: $(LIBTRITONUSESD_JNI_HDRS)
+
+$(LIBTRITONUSESD_JNI_HDRS): stamp-libtritonusesd
@if test -f $@; then :; else \
- rm -f stamp-libtritonusesd; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusesd; \
+ rm -f stamp-libtritonusesd; $(MAKE) stamp-libtritonusesd; \
fi
stamp-libtritonusesd: HDRS = $(LIBTRITONUSESD_JNI_HDRS)
stamp-libtritonusesd: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for libxmlj
#
-libxmlj_headers: stamp-libxmlj
+.PHONY:libxmlj_headers
+libxmlj_headers: $(LIBXMLJ_JNI_HDRS)
+
+$(LIBXMLJ_JNI_HDRS): stamp-libxmlj
@if test -f $@; then :; else \
- rm -f stamp-libxmlj; $(MAKE) JNI_DERIVED_HDRS=$@ stamp-libxmlj; \
+ rm -f stamp-libxmlj; $(MAKE) stamp-libxmlj; \
fi
stamp-libxmlj: HDRS = $(LIBXMLJ_JNI_HDRS)
stamp-libxmlj: rebuild-jni-hdrs
+ @echo timestamp > $@
+
+#
+# header files for classpath's gtk awt backend
+#
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers: $(LIBGTKPEER_JNI_HDRS)
+
+$(LIBGTKPEER_JNI_HDRS): stamp-libgtkpeer
+ @if test -f $@; then :; else \
+ rm -f stamp-libgtkpeer; $(MAKE) stamp-libgtkpeer; \
+ fi
+stamp-libgtkpeer: HDRS = $(LIBGTKPEER_JNI_HDRS)
+stamp-libgtkpeer: rebuild-jni-hdrs
+ @echo timestamp > $@
CLEANFILES = \
@@ -390,7 +396,8 @@
stamp-h1all \
stamp-libtritonusalsa \
stamp-libtritonusesd \
- stamp-libxmlj
+ stamp-libxmlj \
+ stamp-libgtkpeer
dist-hook:
@for file in $(DISTCLEANFILES); do \
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.175 kaffe/include/Makefile.in:1.176
--- kaffe/include/Makefile.in:1.175 Sat Jul 24 01:43:41 2004
+++ kaffe/include/Makefile.in Sun Jul 25 07:59:52 2004
@@ -431,54 +431,6 @@
DERIVED_HDRS = $(INSTALL_DERIVED_HDRS) $(NOINSTALL_DERIVED_HDRS)
INSTALL_JNI_DERIVED_HDRS =
NOINSTALL_JNI_DERIVED_HDRS = \
- gnu_java_awt_peer_gtk_GdkFontMetrics.h \
- gnu_java_awt_peer_gtk_GdkGraphics.h \
- gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
- gnu_java_awt_peer_gtk_GtkButtonPeer.h \
- gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
- gnu_java_awt_peer_gtk_GtkChoicePeer.h \
- gnu_java_awt_peer_gtk_GtkClipboard.h \
- gnu_java_awt_peer_gtk_GtkComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
- gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
- gnu_java_awt_peer_gtk_GtkFramePeer.h \
- gnu_java_awt_peer_gtk_GtkGenericPeer.h \
- gnu_java_awt_peer_gtk_GtkImagePainter.h \
- gnu_java_awt_peer_gtk_GtkLabelPeer.h \
- gnu_java_awt_peer_gtk_GtkListPeer.h \
- gnu_java_awt_peer_gtk_GtkMainThread.h \
- gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
- gnu_java_awt_peer_gtk_GtkMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkPanelPeer.h \
- gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
- gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
- gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
- gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
- gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
- gnu_java_awt_peer_gtk_GtkToolkit.h \
- gnu_java_awt_peer_gtk_GtkWindowPeer.h \
- gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h \
- gnu_xml_libxmlj_dom_GnomeAttr.h \
- gnu_xml_libxmlj_dom_GnomeDocument.h \
- gnu_xml_libxmlj_dom_GnomeDocumentBuilder.h \
- gnu_xml_libxmlj_dom_GnomeDocumentType.h \
- gnu_xml_libxmlj_dom_GnomeElement.h \
- gnu_xml_libxmlj_dom_GnomeEntity.h \
- gnu_xml_libxmlj_dom_GnomeNamedNodeMap.h \
- gnu_xml_libxmlj_dom_GnomeNode.h \
- gnu_xml_libxmlj_dom_GnomeNodeList.h \
- gnu_xml_libxmlj_dom_GnomeProcessingInstruction.h \
- gnu_xml_libxmlj_dom_MatchingNodeList.h \
- gnu_xml_libxmlj_sax_GnomeLocator.h \
- gnu_xml_libxmlj_sax_GnomeXMLReader.h \
- gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
java_math_BigInteger.h \
gnu_java_nio_channels_FileChannelImpl.h \
gnu_java_nio_NIOServerSocket.h \
@@ -526,10 +478,6 @@
org_tritonus_lowlevel_esd_Esd.h \
org_tritonus_lowlevel_esd_EsdRecordingStream.h \
org_tritonus_lowlevel_esd_EsdSample.h \
- org_tritonus_lowlevel_esd_EsdStream.h \
- org_tritonus_lowlevel_esd_Esd.h \
- org_tritonus_lowlevel_esd_EsdRecordingStream.h \
- org_tritonus_lowlevel_esd_EsdSample.h \
org_tritonus_lowlevel_esd_EsdStream.h
LIBXMLJ_JNI_HDRS = \
@@ -547,9 +495,42 @@
gnu_xml_libxmlj_sax_GnomeLocator.h \
gnu_xml_libxmlj_sax_GnomeXMLReader.h \
gnu_xml_libxmlj_transform_LibxsltStylesheet.h \
- gnu_xml_libxmlj_transform_TransformerFactoryImpl.h \
- gnu_xml_libxmlj_transform_JavaContext.h \
- gnu_xml_libxmlj_transform_LibxmlDocument.h
+ gnu_xml_libxmlj_transform_JavaContext.h
+
+LIBGTKPEER_JNI_HDRS = \
+ gnu_java_awt_peer_gtk_GdkFontMetrics.h \
+ gnu_java_awt_peer_gtk_GdkGraphics.h \
+ gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
+ gnu_java_awt_peer_gtk_GtkButtonPeer.h \
+ gnu_java_awt_peer_gtk_GtkCanvasPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkCheckboxPeer.h \
+ gnu_java_awt_peer_gtk_GtkChoicePeer.h \
+ gnu_java_awt_peer_gtk_GtkClipboard.h \
+ gnu_java_awt_peer_gtk_GtkComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
+ gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
+ gnu_java_awt_peer_gtk_GtkFramePeer.h \
+ gnu_java_awt_peer_gtk_GtkGenericPeer.h \
+ gnu_java_awt_peer_gtk_GtkImagePainter.h \
+ gnu_java_awt_peer_gtk_GtkLabelPeer.h \
+ gnu_java_awt_peer_gtk_GtkListPeer.h \
+ gnu_java_awt_peer_gtk_GtkMainThread.h \
+ gnu_java_awt_peer_gtk_GtkMenuBarPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuItemPeer.h \
+ gnu_java_awt_peer_gtk_GtkMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkPanelPeer.h \
+ gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollbarPeer.h \
+ gnu_java_awt_peer_gtk_GtkScrollPanePeer.h \
+ gnu_java_awt_peer_gtk_GtkTextAreaPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextComponentPeer.h \
+ gnu_java_awt_peer_gtk_GtkTextFieldPeer.h \
+ gnu_java_awt_peer_gtk_GtkToolkit.h \
+ gnu_java_awt_peer_gtk_GtkWindowPeer.h \
+ gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.h
@[EMAIL PROTECTED] = #
@[EMAIL PROTECTED] = ifaddrs.h
@@ -609,7 +590,8 @@
stamp-h1all \
stamp-libtritonusalsa \
stamp-libtritonusesd \
- stamp-libxmlj
+ stamp-libxmlj \
+ stamp-libgtkpeer
all: all-am
@@ -921,7 +903,6 @@
rm -f $$f; mv stamp-h1$$f $$f; \
fi; \
done
- @echo timestamp > $@
#
# jni headers of the core libraries
@@ -933,39 +914,67 @@
stamp-h1all: HDRS = $(JNI_DERIVED_HDRS)
stamp-h1all: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for alsa backend of tritonus
#
-libtritonusalsa_headers: stamp-libtritonusalsa
+.PHONY:libtritonusalsa_headers
+libtritonusalsa_headers: $(LIBTRITONUSALSA_JNI_HDRS)
+
+$(LIBTRITONUSALSA_JNI_HDRS): stamp-libtritonusalsa
@if test -f $@; then :; else \
- rm -f stamp-libtritonusalsa; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusalsa; \
+ rm -f stamp-libtritonusalsa; $(MAKE) stamp-libtritonusalsa; \
fi
stamp-libtritonusalsa: HDRS = $(LIBTRITONUSALSA_JNI_HDRS)
stamp-libtritonusalsa: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for esd backend of tritonus
#
-libtritonusesd_headers: stamp-libtritonusesd
+.PHONY:libtritonusesd_headers
+libtritonusesd_headers: $(LIBTRITONUSESD_JNI_HDRS)
+
+$(LIBTRITONUSESD_JNI_HDRS): stamp-libtritonusesd
@if test -f $@; then :; else \
- rm -f stamp-libtritonusesd; $(MAKE) JNI_DERIVED_HDRS=$@
stamp-libtritonusesd; \
+ rm -f stamp-libtritonusesd; $(MAKE) stamp-libtritonusesd; \
fi
stamp-libtritonusesd: HDRS = $(LIBTRITONUSESD_JNI_HDRS)
stamp-libtritonusesd: rebuild-jni-hdrs
+ @echo timestamp > $@
#
# header files for libxmlj
#
-libxmlj_headers: stamp-libxmlj
+.PHONY:libxmlj_headers
+libxmlj_headers: $(LIBXMLJ_JNI_HDRS)
+
+$(LIBXMLJ_JNI_HDRS): stamp-libxmlj
@if test -f $@; then :; else \
- rm -f stamp-libxmlj; $(MAKE) JNI_DERIVED_HDRS=$@ stamp-libxmlj; \
+ rm -f stamp-libxmlj; $(MAKE) stamp-libxmlj; \
fi
stamp-libxmlj: HDRS = $(LIBXMLJ_JNI_HDRS)
stamp-libxmlj: rebuild-jni-hdrs
+ @echo timestamp > $@
+
+#
+# header files for classpath's gtk awt backend
+#
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers: $(LIBGTKPEER_JNI_HDRS)
+
+$(LIBGTKPEER_JNI_HDRS): stamp-libgtkpeer
+ @if test -f $@; then :; else \
+ rm -f stamp-libgtkpeer; $(MAKE) stamp-libgtkpeer; \
+ fi
+
+stamp-libgtkpeer: HDRS = $(LIBGTKPEER_JNI_HDRS)
+stamp-libgtkpeer: rebuild-jni-hdrs
+ @echo timestamp > $@
dist-hook:
@for file in $(DISTCLEANFILES); do \
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.10 kaffe/libraries/clib/Makefile.am:1.11
--- kaffe/libraries/clib/Makefile.am:1.10 Sat Jul 24 01:44:00 2004
+++ kaffe/libraries/clib/Makefile.am Sun Jul 25 07:59:53 2004
@@ -9,19 +9,6 @@
# See the file "license.terms" for information on usage and redistribution
# of this file.
-# Build libxmlj only desired
-if COND_LIBXMLJ
-MAYBE_LIBXMLJ = libxmlj
-else
-MAYBE_LIBXMLJ =
-endif
-
-if COND_NATIVE_AWT
-MAYBE_AWT = awt
-else
-MAYBE_AWT =
-endif
-
-SUBDIRS = native io nio net zip math security management $(MAYBE_LIBXMLJ) $(MAYBE_AWT)
+SUBDIRS = native io nio net zip math security management
DIST_SUBDIRS = native io nio net zip math libxmlj security management awt sound
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.117 kaffe/libraries/clib/Makefile.in:1.118
--- kaffe/libraries/clib/Makefile.in:1.117 Sat Jul 24 01:44:00 2004
+++ kaffe/libraries/clib/Makefile.in Sun Jul 25 07:59:53 2004
@@ -336,13 +336,7 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
[EMAIL PROTECTED]@MAYBE_LIBXMLJ =
-
-# Build libxmlj only desired
[EMAIL PROTECTED]@MAYBE_LIBXMLJ = libxmlj
[EMAIL PROTECTED]@MAYBE_AWT =
[EMAIL PROTECTED]@MAYBE_AWT = awt
-SUBDIRS = native io nio net zip math security management $(MAYBE_LIBXMLJ) $(MAYBE_AWT)
+SUBDIRS = native io nio net zip math security management
DIST_SUBDIRS = native io nio net zip math libxmlj security management awt sound
all: all-recursive
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.1
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.2
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.1 Thu Jul 22
19:04:00 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am Sun Jul 25 07:59:54
2004
@@ -41,3 +41,8 @@
libgtkpeer_la_CPPFLAGS = $(AM_CPPFLAGS) @GTK_CFLAGS@
-I$(top_srcdir)/libraries/clib/awt/classpath-gtk/classpath/ -I$(top_builddir)/include/
libgtkpeer_la_LIBADD =
$(top_builddir)/libraries/clib/awt/classpath-gtk/classpath/native_state.lo
libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
+
+$(libgtkpeer_la_SOURCES): libgtkpeer_headers
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers:
+ @$(MAKE) -C $(top_builddir)/include libgtkpeer_headers
\ No newline at end of file
Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in
diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.2
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.3
--- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.2 Sat Jul 24
01:44:04 2004
+++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in Sun Jul 25 07:59:54
2004
@@ -1572,6 +1572,11 @@
tags uninstall uninstall-am uninstall-info-am \
uninstall-nativeLTLIBRARIES
+
+$(libgtkpeer_la_SOURCES): libgtkpeer_headers
+.PHONY:libgtkpeer_headers
+libgtkpeer_headers:
+ @$(MAKE) -C $(top_builddir)/include libgtkpeer_headers
# 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/javalib/Klasses.jar.bootstrap
cvs rdiff: failed to read diff file header /tmp/cvs1VHPyk for Klasses.jar.bootstrap,v:
end of file
system command returned non-zero exit status: 1: aborting
_______________________________________________
kaffe mailing list
[EMAIL PROTECTED]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
