PatchSet 6917 Date: 2005/09/19 02:51:58 Author: robilad Branch: HEAD Tag: (none) Log: Added missing files from pre1 tarball to makefiles
Members: ChangeLog:1.4439->1.4440 Makefile.am:1.96->1.97 Makefile.in:1.221->1.222 config/Makefile.am:1.63->1.64 config/Makefile.in:1.191->1.192 kaffe/kaffevm/boehm-gc/Makefile.am:INITIAL->1.8 kaffe/kaffevm/boehm-gc/Makefile.in:1.38->1.39 kaffe/kaffevm/kaffe-gc/Makefile.am:1.5->1.6 kaffe/kaffevm/kaffe-gc/Makefile.in:1.37->1.38 libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.19->1.20 libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.43->1.44 libraries/clib/awt/nano-X/Makefile.am:INITIAL->1.3 libraries/clib/awt/nano-X/Makefile.in:1.14->1.15 replace/Makefile.am:1.15->1.16 replace/Makefile.in:1.93->1.94 test/regression/Makefile.am:1.96->1.97 test/regression/Makefile.in:1.218->1.219 tools/gjdoc/javalib/Makefile.am:1.16->1.17 tools/gjdoc/javalib/Makefile.in:1.57->1.58 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.4439 kaffe/ChangeLog:1.4440 --- kaffe/ChangeLog:1.4439 Mon Sep 19 00:55:02 2005 +++ kaffe/ChangeLog Mon Sep 19 02:51:58 2005 @@ -1,5 +1,18 @@ 2005-09-18 Dalibor Topic <[EMAIL PROTECTED]> + Makefile.am, + config/Makefile.am, + kaffe/kaffevm/boehm-gc/Makefile.am, + kaffe/kaffevm/kaffe-gc/Makefile.am, + libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am, + libraries/clib/awt/nano-X/Makefile.am, + replace/Makefile.am, + test/regression/Makefile.am, + tools/gjdoc/javalib/Makefile.am: + Added missing files from pre1 tarball to makefiles. + +2005-09-18 Dalibor Topic <[EMAIL PROTECTED]> + * libraries/clib/io/AudioPlayer.c: Removed. Index: kaffe/Makefile.am diff -u kaffe/Makefile.am:1.96 kaffe/Makefile.am:1.97 --- kaffe/Makefile.am:1.96 Wed Aug 24 02:23:12 2005 +++ kaffe/Makefile.am Mon Sep 19 02:52:05 2005 @@ -55,6 +55,7 @@ ChangeLog.14 \ ChangeLog.15 \ ChangeLog.16 \ + ChangeLog.17 \ THIRDPARTY \ WHATSNEW \ RELEASE-NOTES \ @@ -68,6 +69,7 @@ FAQ/FAQ.awt \ FAQ/FAQ.benchmarking \ FAQ/FAQ.bignum \ + FAQ/FAQ.charsets \ FAQ/FAQ.class-states \ FAQ/FAQ.classlibrary-compile \ FAQ/FAQ.code-layout \ @@ -120,6 +122,10 @@ binreloc/prefix.h \ binreloc/README \ binreloc/test.c \ + developers/boehm-with-kaffe.patch \ + developers/build_mathnamespace \ + developers/check-classpath-unmerged \ + developers/math_symbols \ developers/check-classpath-merge-status \ developers/FullTest.sh \ developers/GCJ.note.1 \ @@ -145,7 +151,20 @@ developers/sp_offset.c \ developers/unicode.pl \ developers/update-class-list \ - developers/utf8munge.pl + developers/utf8munge.pl \ + docs/html/fdl.html \ + docs/html/index.html \ + docs/html/port-kaffe.html \ + docs/src/docbook/port-kaffe/jit-icode.c \ + docs/src/docbook/port-kaffe/fdl.xml \ + docs/src/docbook/port-kaffe/port-kaffe.xml \ + scripts/GCCWarning.pm \ + scripts/JikesWarning.pm \ + scripts/LogWarning.pm \ + scripts/Registry.pm \ + scripts/sort-warnings.pl \ + scripts/SparseWarning.pm \ + scripts/WarningDescription.pm CLEANFILES = BUILD_ENVIRONMENT Index: kaffe/Makefile.in diff -u kaffe/Makefile.in:1.221 kaffe/Makefile.in:1.222 --- kaffe/Makefile.in:1.221 Sat Sep 17 21:37:28 2005 +++ kaffe/Makefile.in Mon Sep 19 02:52:05 2005 @@ -435,6 +435,7 @@ ChangeLog.14 \ ChangeLog.15 \ ChangeLog.16 \ + ChangeLog.17 \ THIRDPARTY \ WHATSNEW \ RELEASE-NOTES \ @@ -448,6 +449,7 @@ FAQ/FAQ.awt \ FAQ/FAQ.benchmarking \ FAQ/FAQ.bignum \ + FAQ/FAQ.charsets \ FAQ/FAQ.class-states \ FAQ/FAQ.classlibrary-compile \ FAQ/FAQ.code-layout \ @@ -500,6 +502,10 @@ binreloc/prefix.h \ binreloc/README \ binreloc/test.c \ + developers/boehm-with-kaffe.patch \ + developers/build_mathnamespace \ + developers/check-classpath-unmerged \ + developers/math_symbols \ developers/check-classpath-merge-status \ developers/FullTest.sh \ developers/GCJ.note.1 \ @@ -525,7 +531,20 @@ developers/sp_offset.c \ developers/unicode.pl \ developers/update-class-list \ - developers/utf8munge.pl + developers/utf8munge.pl \ + docs/html/fdl.html \ + docs/html/index.html \ + docs/html/port-kaffe.html \ + docs/src/docbook/port-kaffe/jit-icode.c \ + docs/src/docbook/port-kaffe/fdl.xml \ + docs/src/docbook/port-kaffe/port-kaffe.xml \ + scripts/GCCWarning.pm \ + scripts/JikesWarning.pm \ + scripts/LogWarning.pm \ + scripts/Registry.pm \ + scripts/sort-warnings.pl \ + scripts/SparseWarning.pm \ + scripts/WarningDescription.pm CLEANFILES = BUILD_ENVIRONMENT noinst_SCRIPTS = libtool BUILD_ENVIRONMENT @@ -740,7 +759,7 @@ distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib + $(mkdir_p) $(distdir)/. $(distdir)/FAQ $(distdir)/binreloc $(distdir)/compat-include $(distdir)/developers $(distdir)/docs/html $(distdir)/docs/src/docbook/port-kaffe $(distdir)/kaffe/man $(distdir)/kaffe/scripts $(distdir)/kaffe/scripts/compat $(distdir)/libraries/javalib $(distdir)/libraries/javalib/gnu/classpath $(distdir)/m4 $(distdir)/po $(distdir)/scripts $(distdir)/test/regression $(distdir)/test/regression/compile_time $(distdir)/test/regression/compiler $(distdir)/test/regression/run_time $(distdir)/tools/gjdoc/javalib @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ Index: kaffe/config/Makefile.am diff -u kaffe/config/Makefile.am:1.63 kaffe/config/Makefile.am:1.64 --- kaffe/config/Makefile.am:1.63 Sun Aug 7 22:58:06 2005 +++ kaffe/config/Makefile.am Mon Sep 19 02:52:07 2005 @@ -267,6 +267,8 @@ mips/callKaffeException.h \ mips/common.h \ mips/irix5/config.frag \ + mips/irix5/jit-md.h \ + mips/irix5/jit3-md.h \ mips/irix5/md.c \ mips/irix5/md.h \ mips/jit.h \ @@ -303,6 +305,7 @@ powerpc/aix/config.frag \ powerpc/aix/md.c \ powerpc/aix/md.h \ + powerpc/bits/atomic.h \ powerpc/common.h \ powerpc/darwin/config.frag \ powerpc/darwin/md.c \ @@ -312,6 +315,7 @@ powerpc/linux/md.c \ powerpc/linux/md.h \ powerpc/linux/sigcontextinfo.h \ + powerpc/linux/jit3-md.h \ powerpc/machten/config.frag \ powerpc/machten/md.c \ powerpc/machten/md.h \ @@ -319,10 +323,13 @@ powerpc/netbsd1/md.c \ powerpc/netbsd1/md.h \ powerpc/netbsd1/jit3-md.h \ + powerpc/powerpc32/atomic.h \ + powerpc/powerpc64/atomic.h \ powerpc/callmethod_ppc.h \ powerpc/jit.h \ powerpc/jit3-icode.h \ powerpc/jit3-powerpc.def \ + powerpc/jit-labels.h \ powerpc/ppc_isa.defs \ powerpc/ppc_isa.h \ powerpc/ppc_macros.h \ Index: kaffe/config/Makefile.in diff -u kaffe/config/Makefile.in:1.191 kaffe/config/Makefile.in:1.192 --- kaffe/config/Makefile.in:1.191 Sat Sep 17 21:37:37 2005 +++ kaffe/config/Makefile.in Mon Sep 19 02:52:07 2005 @@ -612,6 +612,8 @@ mips/callKaffeException.h \ mips/common.h \ mips/irix5/config.frag \ + mips/irix5/jit-md.h \ + mips/irix5/jit3-md.h \ mips/irix5/md.c \ mips/irix5/md.h \ mips/jit.h \ @@ -648,6 +650,7 @@ powerpc/aix/config.frag \ powerpc/aix/md.c \ powerpc/aix/md.h \ + powerpc/bits/atomic.h \ powerpc/common.h \ powerpc/darwin/config.frag \ powerpc/darwin/md.c \ @@ -657,6 +660,7 @@ powerpc/linux/md.c \ powerpc/linux/md.h \ powerpc/linux/sigcontextinfo.h \ + powerpc/linux/jit3-md.h \ powerpc/machten/config.frag \ powerpc/machten/md.c \ powerpc/machten/md.h \ @@ -664,10 +668,13 @@ powerpc/netbsd1/md.c \ powerpc/netbsd1/md.h \ powerpc/netbsd1/jit3-md.h \ + powerpc/powerpc32/atomic.h \ + powerpc/powerpc64/atomic.h \ powerpc/callmethod_ppc.h \ powerpc/jit.h \ powerpc/jit3-icode.h \ powerpc/jit3-powerpc.def \ + powerpc/jit-labels.h \ powerpc/ppc_isa.defs \ powerpc/ppc_isa.h \ powerpc/ppc_macros.h \ @@ -847,7 +854,7 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/alpha $(distdir)/alpha/linux $(distdir)/alpha/netbsd1 $(distdir)/alpha/osf $(distdir)/arm $(distdir)/arm/linux $(distdir)/arm/netbsd1 $(distdir)/arm/riscos $(distdir)/generic $(distdir)/i386 $(distdir)/i386/beos $(distdir)/i386/bsdi $(distdir)/i386/cygwin32 $(distdir)/i386/darwin $(distdir)/i386/dgux $(distdir)/i386/freebsd2 $(distdir)/i386/gnu $(distdir)/i386/linux $(distdir)/i386/netbsd1 $(distdir)/i386/nextstep3 $(distdir)/i386/openbsd2 $(distdir)/i386/oskit $(distdir)/i386/qnx $(distdir)/i386/sco3.2v5 $(distdir)/i386/solaris2 $(distdir)/i386/univel_svr4 $(distdir)/i386/win32 $(distdir)/ia64 $(distdir)/ia64/hpux $(distdir)/ia64/linux $(distdir)/m68k $(distdir)/m68k/a-ux $(distdir)/m68k/amigaos $(distdir)/m68k/linux $(distdir)/m68k/netbsd1 $(distdir)/m68k/nextstep3 $(distdir)/m68k/openbsd2 $(distdir)/m68k/sunos4 $(distdir)/mips $(distdir)/mips/irix5 $(distdir)/mips/linux $(distdir)/mips/netbsd1 $(distdir)/mips/ultrix4 $(distdir)/parisc $(distdir)/parisc/hpux $(distdir)/parisc/linux $(distdir)/powerpc $(distdir)/powerpc/aix $(distdir)/powerpc/darwin $(distdir)/powerpc/linux $(distdir)/powerpc/machten $(distdir)/powerpc/netbsd1 $(distdir)/s390 $(distdir)/s390/linux $(distdir)/sh $(distdir)/sh/linux $(distdir)/sparc $(distdir)/sparc/bsdi3 $(distdir)/sparc/linux $(distdir)/sparc/netbsd1 $(distdir)/sparc/nextstep3 $(distdir)/sparc/openbsd2 $(distdir)/sparc/solaris2 $(distdir)/sparc/sunos4 $(distdir)/sparc/uxpds $(distdir)/x86_64 $(distdir)/x86_64/freebsd2 $(distdir)/x86_64/linux + $(mkdir_p) $(distdir)/alpha $(distdir)/alpha/linux $(distdir)/alpha/netbsd1 $(distdir)/alpha/osf $(distdir)/arm $(distdir)/arm/linux $(distdir)/arm/netbsd1 $(distdir)/arm/riscos $(distdir)/generic $(distdir)/i386 $(distdir)/i386/beos $(distdir)/i386/bsdi $(distdir)/i386/cygwin32 $(distdir)/i386/darwin $(distdir)/i386/dgux $(distdir)/i386/freebsd2 $(distdir)/i386/gnu $(distdir)/i386/linux $(distdir)/i386/netbsd1 $(distdir)/i386/nextstep3 $(distdir)/i386/openbsd2 $(distdir)/i386/oskit $(distdir)/i386/qnx $(distdir)/i386/sco3.2v5 $(distdir)/i386/solaris2 $(distdir)/i386/univel_svr4 $(distdir)/i386/win32 $(distdir)/ia64 $(distdir)/ia64/hpux $(distdir)/ia64/linux $(distdir)/m68k $(distdir)/m68k/a-ux $(distdir)/m68k/amigaos $(distdir)/m68k/linux $(distdir)/m68k/netbsd1 $(distdir)/m68k/nextstep3 $(distdir)/m68k/openbsd2 $(distdir)/m68k/sunos4 $(distdir)/mips $(distdir)/mips/irix5 $(distdir)/mips/linux $(distdir)/mips/netbsd1 $(distdir)/mips/ultrix4 $(distdir)/parisc $(distdir)/parisc/hpux $(distdir)/parisc/linux $(distdir)/powerpc $(distdir)/powerpc/aix $(distdir)/powerpc/bits $(distdir)/powerpc/darwin $(distdir)/powerpc/linux $(distdir)/powerpc/machten $(distdir)/powerpc/netbsd1 $(distdir)/powerpc/powerpc32 $(distdir)/powerpc/powerpc64 $(distdir)/s390 $(distdir)/s390/linux $(distdir)/sh $(distdir)/sh/linux $(distdir)/sparc $(distdir)/sparc/bsdi3 $(distdir)/sparc/linux $(distdir)/sparc/netbsd1 $(distdir)/sparc/nextstep3 $(distdir)/sparc/openbsd2 $(distdir)/sparc/solaris2 $(distdir)/sparc/sunos4 $(distdir)/sparc/uxpds $(distdir)/x86_64 $(distdir)/x86_64/freebsd2 $(distdir)/x86_64/linux @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ =================================================================== Checking out kaffe/kaffe/kaffevm/boehm-gc/Makefile.am RCS: /home/cvs/kaffe/kaffe/kaffe/kaffevm/boehm-gc/Makefile.am,v VERS: 1.8 *************** --- /dev/null Sun Aug 4 19:57:58 2002 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am Mon Sep 19 02:56:49 2005 @@ -0,0 +1,39 @@ +# Makefile.am for the garbage collector - original Kaffe's GC. +# +# Copyright (c) 2004 +# Kaffe.org contributors, see ChangeLogs for details. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution +# of this file. + +SUBDIRS= boehm + +AM_CPPFLAGS = \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/config \ + -I$(top_srcdir)/config \ + -I$(top_srcdir)/kaffe/kaffevm/$(THREAD_DIR) \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/kaffe/kaffevm \ + -I$(top_srcdir)/kaffe/jvmpi \ + -I$(top_srcdir)/kaffe/kaffevm/boehm-gc/boehm/include \ + $(BOEHMGC_SPECIFIC_FLAGS) + +native_LTLIBRARIES = libkaffegc.la + +libkaffegc_la_LDFLAGS = \ + $(KVMLIBFLAGS) \ + -export-dynamic \ + -release $(PACKAGE_VERSION) + +libkaffegc_la_LIBADD= \ + boehm/libgc.la + +libkaffegc_la_SOURCES= \ + gc2.c \ + gc2.h \ + gc-refs.c \ + gc-refs.h \ + gc-kaffe.c \ + gc-kaffe.h + Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.38 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.39 --- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.38 Sat Sep 17 21:37:44 2005 +++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Mon Sep 19 02:52:07 2005 @@ -409,6 +409,7 @@ libkaffegc_la_SOURCES = \ gc2.c \ + gc2.h \ gc-refs.c \ gc-refs.h \ gc-kaffe.c \ Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.5 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.6 --- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.5 Fri May 13 21:05:54 2005 +++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am Mon Sep 19 02:52:07 2005 @@ -26,10 +26,11 @@ libkaffegc_la_SOURCES= \ gc-incremental.c \ + gc-incremental.h \ gc-mem.c \ - gc-refs.c + gc-mem.h \ + gc-refs.c \ + gc-refs.h libkaffegc_la_DEPENDENCIES = \ $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la - -noinst_HEADERS= gc-mem.h gc-incremental.h gc-refs.h Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.37 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.38 --- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.37 Sat Sep 17 21:37:49 2005 +++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Mon Sep 19 02:52:07 2005 @@ -23,7 +23,6 @@ # See the file "license.terms" for information on usage and redistribution # of this file. - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -47,8 +46,7 @@ build_triplet = @build@ host_triplet = @host@ subdir = kaffe/kaffevm/kaffe-gc -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_c_bigendian_cross.m4 \ $(top_srcdir)/m4/acx_pthread.m4 $(top_srcdir)/m4/alsa.m4 \ @@ -91,7 +89,6 @@ $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libkaffegc_la_SOURCES) DIST_SOURCES = $(libkaffegc_la_SOURCES) -HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -392,13 +389,15 @@ libkaffegc_la_SOURCES = \ gc-incremental.c \ + gc-incremental.h \ gc-mem.c \ - gc-refs.c + gc-mem.h \ + gc-refs.c \ + gc-refs.h libkaffegc_la_DEPENDENCIES = \ $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la -noinst_HEADERS = gc-mem.h gc-incremental.h gc-refs.h all: all-am .SUFFIXES: @@ -562,7 +561,7 @@ done check-am: all-am check: check-am -all-am: Makefile $(LTLIBRARIES) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) installdirs: install: install-am install-exec: install-exec-am Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.19 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.20 --- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am:1.19 Thu Aug 25 19:21:54 2005 +++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.am Mon Sep 19 02:52:08 2005 @@ -3,7 +3,7 @@ # Gtk/Cairo JNI sources. if GTK_CAIRO gtk_cairo_c_source_files = \ - gnu_java_awt_peer_gtk_GdkGraphics2D.c + gnu_java_awt_peer_gtk_GdkGraphics2D.c endif libgtkpeer_la_SOURCES = \ @@ -48,7 +48,8 @@ gthread-jni.c \ gthread-jni.h \ gtk_jawt.c \ - gtkpeer.h + gtkpeer.h \ + gtkcairopeer.h libgtkpeer_la_CFLAGS = \ $(CFLAGS_PG) Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.43 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.44 --- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in:1.43 Sat Sep 17 21:38:04 2005 +++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/Makefile.in Mon Sep 19 02:52:08 2005 @@ -113,7 +113,7 @@ gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \ gnu_java_awt_peer_gtk_GtkToolkit.c \ gnu_java_awt_peer_gtk_GtkWindowPeer.c gthread-jni.c \ - gthread-jni.h gtk_jawt.c gtkpeer.h + gthread-jni.h gtk_jawt.c gtkpeer.h gtkcairopeer.h @[EMAIL PROTECTED] = libgtkpeer_la-gnu_java_awt_peer_gtk_GdkGraphics2D.lo am_libgtkpeer_la_OBJECTS = $(am__objects_1) \ libgtkpeer_la-gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.lo \ @@ -456,7 +456,7 @@ # Gtk/Cairo JNI sources. @[EMAIL PROTECTED] = \ [EMAIL PROTECTED]@ gnu_java_awt_peer_gtk_GdkGraphics2D.c [EMAIL PROTECTED]@ gnu_java_awt_peer_gtk_GdkGraphics2D.c libgtkpeer_la_SOURCES = \ $(gtk_cairo_c_source_files) \ @@ -500,7 +500,8 @@ gthread-jni.c \ gthread-jni.h \ gtk_jawt.c \ - gtkpeer.h + gtkpeer.h \ + gtkcairopeer.h libgtkpeer_la_CFLAGS = \ $(CFLAGS_PG) =================================================================== Checking out kaffe/libraries/clib/awt/nano-X/Makefile.am RCS: /home/cvs/kaffe/kaffe/libraries/clib/awt/nano-X/Makefile.am,v VERS: 1.3 *************** --- /dev/null Sun Aug 4 19:57:58 2002 +++ kaffe/libraries/clib/awt/nano-X/Makefile.am Mon Sep 19 02:56:49 2005 @@ -0,0 +1,49 @@ +# nano-X AWT backend for Kaffe +# +# Copyright (c) 2001 +# Exor International Inc. All rights reserved. +# Copyright (c) 2001 +# Sinby Corporation, All rights reserved. +# +# Copyright (c) 2005 +# Kaffe.org contributors, see ChangeLog for details. All rights reserved. +# +# See the file "license.terms" for information on usage and redistribution +# of this file. + +native_LTLIBRARIES = libnanoxawt.la + +AM_CPPFLAGS = \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/kaffe/kaffevm/jni + +libnanoxawt_la_CFLAGS = \ + $(CFLAGS_PG) \ + $(NANOX_CFLAGS) + +libnanoxawt_la_LDFLAGS = \ + $(KLIBFLAGS) \ + -no-undefined \ + -module \ + -release $(PACKAGE_VERSION) \ + -export-symbols-regex "^([Jj]ava|kaffe)_" + +libnanoxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS) + +libnanoxawt_la_SOURCES = \ + awt_const.h \ + keymap.h \ + event.c \ + handler.c \ + color.c \ + font.c \ + window.c \ + graphics.c \ + image.c \ + clipboard.c \ + toolkit.c + +noinst_HEADERS = \ + toolkit.h + +CLEANFILES = so_locations Index: kaffe/libraries/clib/awt/nano-X/Makefile.in diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.14 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.15 --- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.14 Sat Sep 17 21:38:06 2005 +++ kaffe/libraries/clib/awt/nano-X/Makefile.in Mon Sep 19 02:52:08 2005 @@ -412,6 +412,8 @@ libnanoxawt_la_LIBADD = $(top_builddir)/kaffe/kaffevm/libkaffevm.la $(AWT_LIBS) libnanoxawt_la_SOURCES = \ + awt_const.h \ + keymap.h \ event.c \ handler.c \ color.c \ Index: kaffe/replace/Makefile.am diff -u kaffe/replace/Makefile.am:1.15 kaffe/replace/Makefile.am:1.16 --- kaffe/replace/Makefile.am:1.15 Sun Jul 17 16:46:34 2005 +++ kaffe/replace/Makefile.am Mon Sep 19 02:52:09 2005 @@ -26,7 +26,7 @@ inet_ntop.c \ memset.c \ repsemaphore.h \ - semaphores.c + semaphores.c \ ifaddrs.h libreplace_la_LIBADD = \ Index: kaffe/replace/Makefile.in diff -u kaffe/replace/Makefile.in:1.93 kaffe/replace/Makefile.in:1.94 --- kaffe/replace/Makefile.in:1.93 Sat Sep 17 21:38:35 2005 +++ kaffe/replace/Makefile.in Mon Sep 19 02:52:09 2005 @@ -391,7 +391,8 @@ inet_ntop.c \ memset.c \ repsemaphore.h \ - semaphores.c + semaphores.c \ + ifaddrs.h libreplace_la_LIBADD = \ $(LTLIBINTL) @@ -656,7 +657,6 @@ pdf pdf-am ps ps-am tags uninstall uninstall-am \ uninstall-info-am - ifaddrs.h # 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/test/regression/Makefile.am diff -u kaffe/test/regression/Makefile.am:1.96 kaffe/test/regression/Makefile.am:1.97 --- kaffe/test/regression/Makefile.am:1.96 Sun Jul 31 10:44:46 2005 +++ kaffe/test/regression/Makefile.am Mon Sep 19 02:52:09 2005 @@ -317,7 +317,8 @@ $(JASMIN_TESTS_DIST) \ CatchLimits.j \ $(BCEL_TESTS_DIST) \ - TestGnuCrypto.java + TestGnuCrypto.java \ + $(TEST_INTERRUPTING_IO) CLEANFILES = \ *.class \ Index: kaffe/test/regression/Makefile.in diff -u kaffe/test/regression/Makefile.in:1.218 kaffe/test/regression/Makefile.in:1.219 --- kaffe/test/regression/Makefile.in:1.218 Sat Sep 17 21:38:38 2005 +++ kaffe/test/regression/Makefile.in Mon Sep 19 02:52:09 2005 @@ -638,7 +638,8 @@ $(JASMIN_TESTS_DIST) \ CatchLimits.j \ $(BCEL_TESTS_DIST) \ - TestGnuCrypto.java + TestGnuCrypto.java \ + $(TEST_INTERRUPTING_IO) CLEANFILES = \ *.class \ Index: kaffe/tools/gjdoc/javalib/Makefile.am diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.16 kaffe/tools/gjdoc/javalib/Makefile.am:1.17 --- kaffe/tools/gjdoc/javalib/Makefile.am:1.16 Sat Sep 17 21:38:42 2005 +++ kaffe/tools/gjdoc/javalib/Makefile.am Mon Sep 19 02:52:10 2005 @@ -247,6 +247,7 @@ ## Do not delete the previous blank line; update-class-list depends on it gjdoc_ressources = \ + dtd/gjdoc-alphaindex.dtd \ dtd/dbcentx.mod \ dtd/gjdoc.dtd \ dtd/ent/iso-amsa.ent \ @@ -314,7 +315,9 @@ EXTRA_DIST = \ $(antlr_SRCS) \ $(gjdoc_jar_SRCS) \ - $(gjdoc_ressources) + $(gjdoc_ressources) \ + gnu/classpath/tools/doclets/xmldoclet/doctranslet/package.html \ + gnu/classpath/tools/gjdoc/expr/java-expression.g JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] $(SRCDIRS)) JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED] $(gjdoc_ressources)) Index: kaffe/tools/gjdoc/javalib/Makefile.in diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.57 kaffe/tools/gjdoc/javalib/Makefile.in:1.58 --- kaffe/tools/gjdoc/javalib/Makefile.in:1.57 Sat Sep 17 21:38:42 2005 +++ kaffe/tools/gjdoc/javalib/Makefile.in Mon Sep 19 02:52:10 2005 @@ -602,6 +602,7 @@ gnu/classpath/tools/NotifyingInputStreamReader.java gjdoc_ressources = \ + dtd/gjdoc-alphaindex.dtd \ dtd/dbcentx.mod \ dtd/gjdoc.dtd \ dtd/ent/iso-amsa.ent \ @@ -669,7 +670,9 @@ EXTRA_DIST = \ $(antlr_SRCS) \ $(gjdoc_jar_SRCS) \ - $(gjdoc_ressources) + $(gjdoc_ressources) \ + gnu/classpath/tools/doclets/xmldoclet/doctranslet/package.html \ + gnu/classpath/tools/gjdoc/expr/java-expression.g JAR_CMD1 = (cd $(LIBDIR) && $(ZIP) -q -r $(CURDIR)/[EMAIL PROTECTED] $(SRCDIRS)) JAR_CMD2 = (cd $(srcdir) && $(ZIP) -q -DX -r $(CURDIR)/[EMAIL PROTECTED] $(gjdoc_ressources)) _______________________________________________ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe