[kaffe] CVS kaffe (robilad): small make dist fix for libxmlj

Kaffe CVS cvs-commits at kaffe.org
Sun Jan 23 15:18:59 PST 2005


PatchSet 5910 
Date: 2005/01/23 23:14:19
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small make dist fix for libxmlj
2005-01-24  Dalibor Topic  <robilad at kaffe.org>

* libraries/clib/Makefile.am (SUBDIRS): Fix for make dist. Made
libxmlj really be picked up.

Members: 
	ChangeLog:1.3449->1.3450 
	libraries/clib/Makefile.am:1.13->1.14 
	libraries/clib/Makefile.in:1.132->1.133 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3449 kaffe/ChangeLog:1.3450
--- kaffe/ChangeLog:1.3449	Sun Jan 23 22:34:44 2005
+++ kaffe/ChangeLog	Sun Jan 23 23:14:19 2005
@@ -1,3 +1,8 @@
+2005-01-24  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/clib/Makefile.am (SUBDIRS): Fix for make dist. Made
+	libxmlj really be picked up.
+
 2005-01-23  Dalibor Topic  <robilad at kaffe.org>
 
 	* tools/gjdoc/javalib/Makefile.am (EXTRA_DIST): 
Index: kaffe/libraries/clib/Makefile.am
diff -u kaffe/libraries/clib/Makefile.am:1.13 kaffe/libraries/clib/Makefile.am:1.14
--- kaffe/libraries/clib/Makefile.am:1.13	Sun Jan 23 18:48:38 2005
+++ kaffe/libraries/clib/Makefile.am	Sun Jan 23 23:14:22 2005
@@ -10,7 +10,7 @@
 # of this file. 
 
 if COND_LIBXMLJ
-	MAYBE_LIBXMLJ_DIR = libxmlj
+  MAYBE_LIBXMLJ_DIR = libxmlj
 endif
 
-SUBDIRS = classpath native io nio net zip math security management awt sound $(MAYBE_LIBXMLJ_DIR)
+SUBDIRS = classpath native io nio net zip math security management $(MAYBE_LIBXMLJ_DIR) awt sound
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.132 kaffe/libraries/clib/Makefile.in:1.133
--- kaffe/libraries/clib/Makefile.in:1.132	Sun Jan 23 18:48:38 2005
+++ kaffe/libraries/clib/Makefile.in	Sun Jan 23 23:14:22 2005
@@ -88,7 +88,8 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = classpath native io nio net zip math security \
+	management libxmlj awt sound
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 ALSA_CFLAGS = @ALSA_CFLAGS@
@@ -361,7 +362,8 @@
 toolslibdir = @toolslibdir@
 uudecode = @uudecode@
 with_engine = @with_engine@
-SUBDIRS = classpath native io nio net zip math security management awt sound $(MAYBE_LIBXMLJ_DIR)
+ at COND_LIBXMLJ_TRUE@MAYBE_LIBXMLJ_DIR = libxmlj
+SUBDIRS = classpath native io nio net zip math security management $(MAYBE_LIBXMLJ_DIR) awt sound
 all: all-recursive
 
 .SUFFIXES:
@@ -658,8 +660,6 @@
 	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-info-am
 
-
- at COND_LIBXMLJ_TRUE@	MAYBE_LIBXMLJ_DIR = libxmlj
 # 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:




More information about the kaffe mailing list