[kaffe] CVS kaffe (dalibor): Small fixes for make dist
Kaffe CVS
cvs-commits at kaffe.org
Thu Jul 29 16:54:26 PDT 2004
PatchSet 5024
Date: 2004/07/29 11:55:04
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Small fixes for make dist
2004-07-29 Dalibor Topic <robilad at kaffe.org>
* Makefile.am:
(DIST_SUBDIRS) Remove '.'.
Reported by: Casey Marshall <csm at gnu.org>
* kaffe/kaffevm/boehm-gc/Makefile.am:
(libkaffegc_la_SOURCES) Removed unused files, and cleaned up.
* libraries/clib/awt/Makefile.am:
Cleaned up. Removed DIST_SUBDIRS.
Reported by: Alexandre Duret-Lutz <adl at src.lip6.fr>
* libraries/javalib/Makefile.am.in:
Cleaned up. Removed unused files and directories from
EXTRA_DIST.
* Makefile.in,
kaffe/kaffevm/boehm-gc/Makefile.in,
libraries/clib/awt/Makefile.in,
libraries/javalib/Makefile.am,
libraries/javalib/Makefile.in:
Regenerated.
Members:
ChangeLog:1.2582->1.2583
Makefile.am:1.77->1.78
Makefile.in:1.175->1.176
kaffe/kaffevm/boehm-gc/Makefile.am:1.3->1.4
kaffe/kaffevm/boehm-gc/Makefile.in:1.7->1.8
libraries/clib/awt/Makefile.am:1.8->1.9
libraries/clib/awt/Makefile.in:1.121->1.122
libraries/javalib/Makefile.am:1.209->1.210
libraries/javalib/Makefile.am.in:1.17->1.18
libraries/javalib/Makefile.in:1.285->1.286
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2582 kaffe/ChangeLog:1.2583
--- kaffe/ChangeLog:1.2582 Tue Jul 27 15:58:04 2004
+++ kaffe/ChangeLog Thu Jul 29 11:55:04 2004
@@ -1,3 +1,29 @@
+2004-07-29 Dalibor Topic <robilad at kaffe.org>
+
+ * Makefile.am:
+ (DIST_SUBDIRS) Remove '.'.
+
+ Reported by: Casey Marshall <csm at gnu.org>
+
+ * kaffe/kaffevm/boehm-gc/Makefile.am:
+ (libkaffegc_la_SOURCES) Removed unused files, and cleaned up.
+
+ * libraries/clib/awt/Makefile.am:
+ Cleaned up. Removed DIST_SUBDIRS.
+
+ Reported by: Alexandre Duret-Lutz <adl at src.lip6.fr>
+
+ * libraries/javalib/Makefile.am.in:
+ Cleaned up. Removed unused files and directories from
+ EXTRA_DIST.
+
+ * Makefile.in,
+ kaffe/kaffevm/boehm-gc/Makefile.in,
+ libraries/clib/awt/Makefile.in,
+ libraries/javalib/Makefile.am,
+ libraries/javalib/Makefile.in:
+ Regenerated.
+
2004-07-26 Dalibor Topic <robilad at kaffe.org>
* libraries/javalib/gnu/java/io/EncodingManager.java:
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.77 kaffe/Makefile.am:1.78
--- kaffe/Makefile.am:1.77 Sat Jul 24 01:43:29 2004
+++ kaffe/Makefile.am Thu Jul 29 11:55:09 2004
@@ -15,7 +15,7 @@
AUTOMAKE_OPTIONS = foreign 1.3e
SUBDIRS =
-DIST_SUBDIRS = . config include replace libltdl kaffe libraries tools test po
+DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
EXTRA_DIST = \
ChangeLog.1 \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.175 kaffe/Makefile.in:1.176
--- kaffe/Makefile.in:1.175 Sat Jul 24 01:43:29 2004
+++ kaffe/Makefile.in Thu Jul 29 11:55:09 2004
@@ -366,7 +366,7 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign 1.3e
SUBDIRS =
-DIST_SUBDIRS = . config include replace libltdl kaffe libraries tools test po
+DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
EXTRA_DIST = \
ChangeLog.1 \
ChangeLog.2 \
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.3 kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.4
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.3 Fri Jul 23 13:45:22 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am Thu Jul 29 11:55:11 2004
@@ -30,16 +30,12 @@
libkaffegc_la_SOURCES= \
gc2.c \
- \
boehm/allchblk.c boehm/alloc.c boehm/blacklst.c boehm/checksums.c \
boehm/dbg_mlc.c boehm/dyn_load.c boehm/finalize.c \
boehm/include/private/gcconfig.h \
boehm/include/gc.h \
boehm/include/gc_alloc.h \
boehm/include/gc_cpp.h \
- boehm/include/private/gc_hdrs.h \
- boehm/include/private/gc_mark.h \
- boehm/include/private/gc_priv.h \
boehm/include/gc_typed.h \
boehm/gcj_mlc.c \
boehm/headers.c \
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.7 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.8
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.7 Sat Jul 24 01:43:46 2004
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Thu Jul 29 11:55:11 2004
@@ -400,16 +400,12 @@
libkaffegc_la_SOURCES = \
gc2.c \
- \
boehm/allchblk.c boehm/alloc.c boehm/blacklst.c boehm/checksums.c \
boehm/dbg_mlc.c boehm/dyn_load.c boehm/finalize.c \
boehm/include/private/gcconfig.h \
boehm/include/gc.h \
boehm/include/gc_alloc.h \
boehm/include/gc_cpp.h \
- boehm/include/private/gc_hdrs.h \
- boehm/include/private/gc_mark.h \
- boehm/include/private/gc_priv.h \
boehm/include/gc_typed.h \
boehm/gcj_mlc.c \
boehm/headers.c \
Index: kaffe/libraries/clib/awt/Makefile.am
diff -u kaffe/libraries/clib/awt/Makefile.am:1.8 kaffe/libraries/clib/awt/Makefile.am:1.9
--- kaffe/libraries/clib/awt/Makefile.am:1.8 Sat Jul 24 01:44:01 2004
+++ kaffe/libraries/clib/awt/Makefile.am Thu Jul 29 11:55:12 2004
@@ -18,31 +18,20 @@
if COND_KAFFE_X_AWT
MAYBE_KAFFE_X_AWT = X
-else
-MAYBE_KAFFE_X_AWT =
endif
if COND_KAFFE_QT_AWT
MAYBE_KAFFE_QT_AWT = qt
-else
-MAYBE_KAFFE_QT_AWT =
endif
if COND_CLASSPATH_GTK_AWT
MAYBE_CLASSPATH_GTK_AWT = classpath-gtk
-else
-MAYBE_CLASSPATH_GTK_AWT =
endif
SUBDIRS = \
$(MAYBE_KAFFE_X_AWT) \
$(MAYBE_KAFFE_QT_AWT) \
$(MAYBE_CLASSPATH_GTK_AWT)
-
-DIST_SUBDIRS = \
- X \
- qt \
- classpath-gtk
EXTRA_DIST = \
win32/btn.cpp \
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.121 kaffe/libraries/clib/awt/Makefile.in:1.122
--- kaffe/libraries/clib/awt/Makefile.in:1.121 Sat Jul 24 01:44:01 2004
+++ kaffe/libraries/clib/awt/Makefile.in Thu Jul 29 11:55:12 2004
@@ -89,6 +89,7 @@
uninstall-recursive
ETAGS = etags
CTAGS = ctags
+DIST_SUBDIRS = X qt classpath-gtk
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -343,21 +344,13 @@
target_alias = @target_alias@
toolslibdir = @toolslibdir@
with_engine = @with_engine@
- at COND_KAFFE_X_AWT_FALSE@MAYBE_KAFFE_X_AWT =
@COND_KAFFE_X_AWT_TRUE at MAYBE_KAFFE_X_AWT = X
- at COND_KAFFE_QT_AWT_FALSE@MAYBE_KAFFE_QT_AWT =
@COND_KAFFE_QT_AWT_TRUE at MAYBE_KAFFE_QT_AWT = qt
- at COND_CLASSPATH_GTK_AWT_FALSE@MAYBE_CLASSPATH_GTK_AWT =
@COND_CLASSPATH_GTK_AWT_TRUE at MAYBE_CLASSPATH_GTK_AWT = classpath-gtk
SUBDIRS = \
$(MAYBE_KAFFE_X_AWT) \
$(MAYBE_KAFFE_QT_AWT) \
$(MAYBE_CLASSPATH_GTK_AWT)
-
-DIST_SUBDIRS = \
- X \
- qt \
- classpath-gtk
EXTRA_DIST = \
win32/btn.cpp \
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.209 kaffe/libraries/javalib/Makefile.am:1.210
--- kaffe/libraries/javalib/Makefile.am:1.209 Mon Jul 26 21:13:44 2004
+++ kaffe/libraries/javalib/Makefile.am Thu Jul 29 11:55:13 2004
@@ -25,13 +25,6 @@
SRCDIRS = com gnu java javax kaffe org
-## Pick source of java math implementation
-if COND_PURE_JAVA_MATH
- JAVA_MATH_FILES = pure_java_math.files
-else
- JAVA_MATH_FILES = native_java_math.files
-endif
-
## taken from top level Makefile.am
JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
@@ -4219,9 +4212,7 @@
javax \
kaffe \
org \
- pure-java \
all.files \
- native_java_math.files \
bootstrap.classlist \
$(OMITTED_PACKAGES_SRCS) \
$(serialized_converters) \
Index: kaffe/libraries/javalib/Makefile.am.in
diff -u kaffe/libraries/javalib/Makefile.am.in:1.17 kaffe/libraries/javalib/Makefile.am.in:1.18
--- kaffe/libraries/javalib/Makefile.am.in:1.17 Sun Jul 25 06:46:44 2004
+++ kaffe/libraries/javalib/Makefile.am.in Thu Jul 29 11:55:13 2004
@@ -25,13 +25,6 @@
SRCDIRS = com gnu java javax kaffe org
-## Pick source of java math implementation
-if COND_PURE_JAVA_MATH
- JAVA_MATH_FILES = pure_java_math.files
-else
- JAVA_MATH_FILES = native_java_math.files
-endif
-
## taken from top level Makefile.am
JAVA=$(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
KAFFELIBRARYPATH=$(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
@@ -166,9 +159,7 @@
javax \
kaffe \
org \
- pure-java \
all.files \
- native_java_math.files \
bootstrap.classlist \
$(OMITTED_PACKAGES_SRCS) \
$(serialized_converters) \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.285 kaffe/libraries/javalib/Makefile.in:1.286
--- kaffe/libraries/javalib/Makefile.in:1.285 Mon Jul 26 21:13:45 2004
+++ kaffe/libraries/javalib/Makefile.in Thu Jul 29 11:55:13 2004
@@ -357,8 +357,6 @@
with_engine = @with_engine@
SUBDIRS = . awt-implementations gmp-math
SRCDIRS = com gnu java javax kaffe org
- at COND_PURE_JAVA_MATH_FALSE@JAVA_MATH_FILES = native_java_math.files
- at COND_PURE_JAVA_MATH_TRUE@JAVA_MATH_FILES = pure_java_math.files
JAVA = $(top_builddir)/kaffe/kaffe/kaffe-bin$(EXEEXT)
KAFFELIBRARYPATH = $(top_builddir)/libraries/clib/native/:$(top_builddir)/libraries/clib/io/:$(top_builddir)/libraries/clib/zip/:$(top_builddir)/libraries/clib/nio/
BOOTCLASSPATH = $(LIBDIR):$(srcdir)/Klasses.jar.bootstrap
@@ -4799,9 +4797,7 @@
javax \
kaffe \
org \
- pure-java \
all.files \
- native_java_math.files \
bootstrap.classlist \
$(OMITTED_PACKAGES_SRCS) \
$(serialized_converters) \
More information about the kaffe
mailing list