PatchSet 5933
Date: 2005/01/28 12:39:06
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Fixed awt-less build
2005-01-28 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/clib/Makefile.am (SUBDIRS): Only descend into awt subdir
if native AWT should be built.
Reported by: Kiyo Inaba <[EMAIL PROTECTED]>
Members:
ChangeLog:1.3472->1.3473
libraries/clib/Makefile.am:1.14->1.15
libraries/clib/Makefile.in:1.134->1.135
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3472 kaffe/ChangeLog:1.3473
--- kaffe/ChangeLog:1.3472 Thu Jan 27 19:39:07 2005
+++ kaffe/ChangeLog Fri Jan 28 12:39:06 2005
@@ -1,3 +1,10 @@
+2005-01-28 Dalibor Topic <[EMAIL PROTECTED]>
+
+ * libraries/clib/Makefile.am (SUBDIRS): Only descend into awt subdir
+ if native AWT should be built.
+
+ Reported by: Kiyo Inaba <[EMAIL PROTECTED]>
+
2005-01-27 Dalibor Topic <[EMAIL PROTECTED]>
* libraries/javalib/gnu/java/net/protocol/ftp/FTPURLConnection.java:
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.14
kaffe/libraries/clib/Makefile.am:1.15
--- kaffe/libraries/clib/Makefile.am:1.14 Sun Jan 23 23:14:22 2005
+++ kaffe/libraries/clib/Makefile.am Fri Jan 28 12:39:08 2005
@@ -13,4 +13,20 @@
MAYBE_LIBXMLJ_DIR = libxmlj
endif
-SUBDIRS = classpath native io nio net zip math security management
$(MAYBE_LIBXMLJ_DIR) awt sound
+if COND_NATIVE_AWT
+ MAYBE_NATIVE_AWT_DIR = awt
+endif
+
+SUBDIRS = \
+ classpath \
+ native \
+ io \
+ nio \
+ net \
+ zip \
+ math \
+ security \
+ management \
+ $(MAYBE_LIBXMLJ_DIR) \
+ $(MAYBE_NATIVE_AWT_DIR) \
+ sound
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.134
kaffe/libraries/clib/Makefile.in:1.135
--- kaffe/libraries/clib/Makefile.in:1.134 Thu Jan 27 01:07:45 2005
+++ kaffe/libraries/clib/Makefile.in Fri Jan 28 12:39:09 2005
@@ -363,7 +363,21 @@
uudecode = @uudecode@
with_engine = @with_engine@
@[EMAIL PROTECTED] = libxmlj
-SUBDIRS = classpath native io nio net zip math security management
$(MAYBE_LIBXMLJ_DIR) awt sound
[EMAIL PROTECTED]@MAYBE_NATIVE_AWT_DIR = awt
+SUBDIRS = \
+ classpath \
+ native \
+ io \
+ nio \
+ net \
+ zip \
+ math \
+ security \
+ management \
+ $(MAYBE_LIBXMLJ_DIR) \
+ $(MAYBE_NATIVE_AWT_DIR) \
+ sound
+
all: all-recursive
.SUFFIXES:
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
