PatchSet 7637
Date: 2007/12/31 17:15:28
Author: robilad
Branch: HEAD
Tag: (none)
Log:
removed unused variables from Makefile.am
2007-12-31 Dalibor Topic <[EMAIL PROTECTED]>
* Makefile.am (DIRECTORIES_BEFORE_RTJAR, DIRECTORIES_AFTER_RTJAR,
RUN_PO): Removed.
Members:
ChangeLog:1.5135->1.5136
Makefile.am:1.139->1.140
Makefile.in:1.292->1.293
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5135 kaffe/ChangeLog:1.5136
--- kaffe/ChangeLog:1.5135 Mon Dec 31 16:58:09 2007
+++ kaffe/ChangeLog Mon Dec 31 17:15:28 2007
@@ -1,5 +1,9 @@
2007-12-31 Dalibor Topic <[EMAIL PROTECTED]>
+ * Makefile.am (DIRECTORIES_BEFORE_RTJAR, DIRECTORIES_AFTER_RTJAR,
RUN_PO): Removed.
+
+2007-12-31 Dalibor Topic <[EMAIL PROTECTED]>
+
* FAQ/FAQ.gnu-classpath: Removed.
* Makefile.am (EXTRA_DIST): Removed FAQ/FAQ.gnu-classpath.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.139 kaffe/Makefile.am:1.140
--- kaffe/Makefile.am:1.139 Mon Dec 31 16:58:09 2007
+++ kaffe/Makefile.am Mon Dec 31 17:15:30 2007
@@ -190,49 +190,5 @@
docs-regen: docs-docbook-html
cp -f target/docs/docbook/*.html $(srcdir)/docs/html
-
-#
-# things we need to compile before we can compile rt.jar
-#
-DIRECTORIES_BEFORE_RTJAR = \
- config \
- include \
- replace \
- libltdl \
- kaffe/kaffevm \
- libraries/clib \
- kaffe
-
-#
-# things we need to compile after we have compiled rt.jar
-#
-DIRECTORIES_AFTER_RTJAR = \
- tools \
- test \
- $(RUN_PO)
-
-if MAY_RUN_PO
-RUN_PO=po
-else
-RUN_PO=
-endif
-
-if COND_SOUND_ALSA
-DIRECTORIES_AFTER_RTJAR += libraries/clib/sound
-else
-if COND_SOUND_ESD
-DIRECTORIES_AFTER_RTJAR += libraries/clib/sound
-endif
-endif
-
-if COND_NATIVE_AWT
-if COND_KAFFE_X_AWT
-DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/X
-endif
-if COND_KAFFE_XYNTH_AWT
-DIRECTORIES_AFTER_RTJAR += libraries/clib/awt/xynth
-endif
-endif
-
check-local:
cd test && $(MAKE) check
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.292 kaffe/Makefile.in:1.293
--- kaffe/Makefile.in:1.292 Mon Dec 31 16:44:59 2007
+++ kaffe/Makefile.in Mon Dec 31 17:15:30 2007
@@ -43,10 +43,6 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
[EMAIL PROTECTED]@am__append_1 = libraries/clib/sound
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/sound
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/awt/X
[EMAIL PROTECTED]@@[EMAIL PROTECTED] = libraries/clib/awt/xynth
subdir = .
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/project.properties.in \
@@ -400,7 +396,6 @@
FAQ/FAQ.gcblock \
FAQ/FAQ.gcj \
FAQ/FAQ.gcstrategy \
- FAQ/FAQ.gnu-classpath \
FAQ/FAQ.hpux \
FAQ/FAQ.hotjava \
FAQ/FAQ.install-root \
@@ -460,27 +455,6 @@
CLEANFILES = BUILD_ENVIRONMENT
noinst_SCRIPTS = libtool BUILD_ENVIRONMENT
CLASSDIRS = libraries/javalib
-
-#
-# things we need to compile before we can compile rt.jar
-#
-DIRECTORIES_BEFORE_RTJAR = \
- config \
- include \
- replace \
- libltdl \
- kaffe/kaffevm \
- libraries/clib \
- kaffe
-
-
-#
-# things we need to compile after we have compiled rt.jar
-#
-DIRECTORIES_AFTER_RTJAR = tools test $(RUN_PO) $(am__append_1) \
- $(am__append_2) $(am__append_3) $(am__append_4)
[EMAIL PROTECTED]@RUN_PO =
[EMAIL PROTECTED]@RUN_PO = po
all: all-recursive
.SUFFIXES:
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
