[kaffe] CVS kaffe (robilad): libraries/javalib/awt-implementations/kaffe/Makefile.am,

Kaffe CVS cvs-commits at kaffe.org
Sun Jun 24 16:38:31 PDT 2007


PatchSet 7492 
Date: 2007/06/24 23:37:26
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
2007-06-25  Dalibor Topic  <robilad at kaffe.org>

        * libraries/javalib/awt-implementations/kaffe/Makefile.am,
        libraries/javalib/dnsjava/Makefile.am,
        libraries/javalib/tritonus-sound/Makefile.am,
        libraries/javalib/vmspecific/Makefile.am,
        libraries/javalib/zlib-zip/Makefile.am,
        tools/gjdoc/javalib/Makefile.am:
        Simplified jar commands to use a single one as much as possible,
        since jar on cygwin does not implement -u.

        * libraries/javalib/awt-implementations/kaffe/Makefile.in,
        libraries/javalib/dnsjava/Makefile.in,
        libraries/javalib/tritonus-sound/Makefile.in,
        libraries/javalib/vmspecific/Makefile.in,
        libraries/javalib/zlib-zip/Makefile.in,
        tools/gjdoc/javalib/Makefile.in:
        Regenerated.

Members: 
	ChangeLog:1.4991->1.4992 
	libraries/javalib/awt-implementations/kaffe/Makefile.am:1.24->1.25 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.85->1.86 
	libraries/javalib/dnsjava/Makefile.am:1.3->1.4 
	libraries/javalib/dnsjava/Makefile.in:1.11->1.12 
	libraries/javalib/tritonus-sound/Makefile.am:1.3->1.4 
	libraries/javalib/tritonus-sound/Makefile.in:1.11->1.12 
	libraries/javalib/vmspecific/Makefile.am:1.6->1.7 
	libraries/javalib/vmspecific/Makefile.in:1.12->1.13 
	libraries/javalib/zlib-zip/Makefile.am:1.4->1.5 
	libraries/javalib/zlib-zip/Makefile.in:1.11->1.12 
	tools/gjdoc/javalib/Makefile.am:1.25->1.26 
	tools/gjdoc/javalib/Makefile.in:1.99->1.100 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4991 kaffe/ChangeLog:1.4992
--- kaffe/ChangeLog:1.4991	Thu Jun 14 13:17:18 2007
+++ kaffe/ChangeLog	Sun Jun 24 23:37:26 2007
@@ -1,3 +1,22 @@
+2007-06-25  Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/javalib/awt-implementations/kaffe/Makefile.am,
+	libraries/javalib/dnsjava/Makefile.am,
+	libraries/javalib/tritonus-sound/Makefile.am,
+	libraries/javalib/vmspecific/Makefile.am,
+	libraries/javalib/zlib-zip/Makefile.am,
+	tools/gjdoc/javalib/Makefile.am:
+	Simplified jar commands to use a single one as much as possible,
+	since jar on cygwin does not implement -u.
+
+	* libraries/javalib/awt-implementations/kaffe/Makefile.in,
+	libraries/javalib/dnsjava/Makefile.in,
+	libraries/javalib/tritonus-sound/Makefile.in,
+	libraries/javalib/vmspecific/Makefile.in,
+	libraries/javalib/zlib-zip/Makefile.in,
+	tools/gjdoc/javalib/Makefile.in:
+	Regenerated.
+
 2007-06-14  Dalibor Topic  <robilad at kaffe.org>
 
 	* m4/classpath.m4: Removed unused check for jni.h.
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.24 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.25
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am:1.24	Mon Sep 18 17:00:52 2006
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.am	Sun Jun 24 23:37:27 2007
@@ -2,8 +2,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) java)
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
@@ -13,7 +12,6 @@
 $(CLASSFILE): classdist_kaffeawt.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in
diff -u kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.85 kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.86
--- kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in:1.85	Wed Jun 13 02:19:40 2007
+++ kaffe/libraries/javalib/awt-implementations/kaffe/Makefile.in	Sun Jun 24 23:37:27 2007
@@ -290,8 +290,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) java)
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -841,7 +840,6 @@
 $(CLASSFILE): classdist_kaffeawt.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/dnsjava/Makefile.am
diff -u kaffe/libraries/javalib/dnsjava/Makefile.am:1.3 kaffe/libraries/javalib/dnsjava/Makefile.am:1.4
--- kaffe/libraries/javalib/dnsjava/Makefile.am:1.3	Sun Aug 20 22:28:40 2006
+++ kaffe/libraries/javalib/dnsjava/Makefile.am	Sun Jun 24 23:37:27 2007
@@ -2,8 +2,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu)
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
@@ -13,7 +12,6 @@
 $(CLASSFILE): classdist_dnsjava.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/dnsjava/Makefile.in
diff -u kaffe/libraries/javalib/dnsjava/Makefile.in:1.11 kaffe/libraries/javalib/dnsjava/Makefile.in:1.12
--- kaffe/libraries/javalib/dnsjava/Makefile.in:1.11	Wed Jun 13 02:19:40 2007
+++ kaffe/libraries/javalib/dnsjava/Makefile.in	Sun Jun 24 23:37:27 2007
@@ -290,8 +290,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu)
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -645,7 +644,6 @@
 $(CLASSFILE): classdist_dnsjava.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/tritonus-sound/Makefile.am
diff -u kaffe/libraries/javalib/tritonus-sound/Makefile.am:1.3 kaffe/libraries/javalib/tritonus-sound/Makefile.am:1.4
--- kaffe/libraries/javalib/tritonus-sound/Makefile.am:1.3	Mon Sep 18 20:34:36 2006
+++ kaffe/libraries/javalib/tritonus-sound/Makefile.am	Sun Jun 24 23:37:27 2007
@@ -2,8 +2,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(srcdir) META-INF)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(srcdir) META-INF)
 
 CPATH =  .:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
@@ -13,7 +12,6 @@
 $(CLASSFILE): classdist_tritonus.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/tritonus-sound/Makefile.in
diff -u kaffe/libraries/javalib/tritonus-sound/Makefile.in:1.11 kaffe/libraries/javalib/tritonus-sound/Makefile.in:1.12
--- kaffe/libraries/javalib/tritonus-sound/Makefile.in:1.11	Wed Jun 13 02:19:41 2007
+++ kaffe/libraries/javalib/tritonus-sound/Makefile.in	Sun Jun 24 23:37:28 2007
@@ -290,8 +290,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(srcdir) META-INF)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(srcdir) META-INF)
 CPATH = .:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -656,7 +655,6 @@
 $(CLASSFILE): classdist_tritonus.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/vmspecific/Makefile.am
diff -u kaffe/libraries/javalib/vmspecific/Makefile.am:1.6 kaffe/libraries/javalib/vmspecific/Makefile.am:1.7
--- kaffe/libraries/javalib/vmspecific/Makefile.am:1.6	Wed Jan  3 23:02:33 2007
+++ kaffe/libraries/javalib/vmspecific/Makefile.am	Sun Jun 24 23:37:28 2007
@@ -2,9 +2,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
-JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu -C $(LIBDIR) java)
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
@@ -14,8 +12,6 @@
 $(CLASSFILE): classdist_vminterface.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
-	$(JAR_CMD3)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/vmspecific/Makefile.in
diff -u kaffe/libraries/javalib/vmspecific/Makefile.in:1.12 kaffe/libraries/javalib/vmspecific/Makefile.in:1.13
--- kaffe/libraries/javalib/vmspecific/Makefile.in:1.12	Wed Jun 13 02:19:41 2007
+++ kaffe/libraries/javalib/vmspecific/Makefile.in	Sun Jun 24 23:37:28 2007
@@ -291,9 +291,7 @@
 SRCDIRS = org
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
-JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu -C $(LIBDIR) java)
 CPATH = .:$(srcdir):$(LIBDIR):$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -568,8 +566,6 @@
 $(CLASSFILE): classdist_vminterface.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
-	$(JAR_CMD3)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/zlib-zip/Makefile.am
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.am:1.4 kaffe/libraries/javalib/zlib-zip/Makefile.am:1.5
--- kaffe/libraries/javalib/zlib-zip/Makefile.am:1.4	Mon Sep 18 17:00:56 2006
+++ kaffe/libraries/javalib/zlib-zip/Makefile.am	Sun Jun 24 23:37:28 2007
@@ -2,8 +2,7 @@
 SRCDIRS = org java
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) org)
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) org -C $(LIBDIR) java)
 
 CPATH =  .:$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
@@ -13,7 +12,6 @@
 $(CLASSFILE): classdist_zlib.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/libraries/javalib/zlib-zip/Makefile.in
diff -u kaffe/libraries/javalib/zlib-zip/Makefile.in:1.11 kaffe/libraries/javalib/zlib-zip/Makefile.in:1.12
--- kaffe/libraries/javalib/zlib-zip/Makefile.in:1.11	Wed Jun 13 02:19:41 2007
+++ kaffe/libraries/javalib/zlib-zip/Makefile.in	Sun Jun 24 23:37:28 2007
@@ -290,8 +290,7 @@
 SRCDIRS = org java
 jrelib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) org)
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) java)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) org -C $(LIBDIR) java)
 CPATH = .:$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -bootclasspath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -538,7 +537,6 @@
 $(CLASSFILE): classdist_zlib.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/tools/gjdoc/javalib/Makefile.am
diff -u kaffe/tools/gjdoc/javalib/Makefile.am:1.25 kaffe/tools/gjdoc/javalib/Makefile.am:1.26
--- kaffe/tools/gjdoc/javalib/Makefile.am:1.25	Sun Aug 20 22:28:48 2006
+++ kaffe/tools/gjdoc/javalib/Makefile.am	Sun Jun 24 23:37:28 2007
@@ -2,11 +2,9 @@
 SRCDIRS = antlr
 toolslib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
-JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
-JAR_CMD4 = (PWD=`pwd` && cd  $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE) $(gjdoc_ressources))
-JAR_CMD5 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu -C $(LIBDIR) com)
+JAR_CMD2 = (PWD=`pwd` && cd  $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE) $(gjdoc_ressources))
+JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
 
 CPATH =  .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
@@ -18,8 +16,6 @@
 	$(JAR_CMD1)
 	$(JAR_CMD2)
 	$(JAR_CMD3)
-	$(JAR_CMD4)
-	$(JAR_CMD5)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/tools/gjdoc/javalib/Makefile.in
diff -u kaffe/tools/gjdoc/javalib/Makefile.in:1.99 kaffe/tools/gjdoc/javalib/Makefile.in:1.100
--- kaffe/tools/gjdoc/javalib/Makefile.in:1.99	Wed Jun 13 02:19:45 2007
+++ kaffe/tools/gjdoc/javalib/Makefile.in	Sun Jun 24 23:37:28 2007
@@ -290,11 +290,9 @@
 SRCDIRS = antlr
 toolslib_DATA = $(CLASSFILE)
 LIBDIR = lib
-JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) gnu)
-JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) -C $(LIBDIR) com)
-JAR_CMD4 = (PWD=`pwd` && cd  $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE) $(gjdoc_ressources))
-JAR_CMD5 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
+JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS) -C $(LIBDIR) gnu -C $(LIBDIR) com)
+JAR_CMD2 = (PWD=`pwd` && cd  $(srcdir) && $(FASTJAR) uf $(PWD)/$(CLASSFILE) $(gjdoc_ressources))
+JAR_CMD3 = ($(FASTJAR) uf $(CLASSFILE) version.properties)
 CPATH = .:$(srcdir):$(LIBDIR):$(top_builddir)/libraries/javalib/vmspecific/kaffe-vminterface.jar:$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -837,8 +835,6 @@
 	$(JAR_CMD1)
 	$(JAR_CMD2)
 	$(JAR_CMD3)
-	$(JAR_CMD4)
-	$(JAR_CMD5)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)



More information about the kaffe mailing list