[kaffe] CVS kaffe (robilad): small make distcheck fix

[Kaffe CVS]

PatchSet 7465 
Date: 2007/01/08 00:16:29
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
small make distcheck fix

2007-01-08  Dalibor Topic  <robilad at kaffe.org>

        Small fix for make distcheck.

        * tools/javatools/Makefile.am (JAR_CMD2): Removed since
        org subdirectory has been deleted.
        (CLASSFILE): Don't invoke JAR_CMD2.

Members: 
	ChangeLog:1.4965->1.4966 
	tools/javatools/Makefile.am:1.4->1.5 
	tools/javatools/Makefile.in:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4965 kaffe/ChangeLog:1.4966
--- kaffe/ChangeLog:1.4965	Sun Jan  7 22:14:39 2007
+++ kaffe/ChangeLog	Mon Jan  8 00:16:29 2007
@@ -1,3 +1,11 @@
+2007-01-08  Dalibor Topic  <robilad at kaffe.org>
+
+	Small fix for make distcheck.
+
+	* tools/javatools/Makefile.am (JAR_CMD2): Removed since
+	org subdirectory has been deleted.
+	(CLASSFILE): Don't invoke JAR_CMD2.
+
 2007-01-07  Dalibor Topic  <robilad at kaffe.org>
 
 	* THIRDPARTY: Removed license information for components that are
Index: kaffe/tools/javatools/Makefile.am
diff -u kaffe/tools/javatools/Makefile.am:1.4 kaffe/tools/javatools/Makefile.am:1.5
--- kaffe/tools/javatools/Makefile.am:1.4	Sun Jan  7 22:14:50 2007
+++ kaffe/tools/javatools/Makefile.am	Mon Jan  8 00:16:29 2007
@@ -3,7 +3,6 @@
 toolslib_DATA = $(CLASSFILE)
 LIBDIR = lib
 JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(srcdir) org)
 
 CPATH =  .:$(LIBDIR):$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
@@ -13,7 +12,6 @@
 $(CLASSFILE): classdist_tools.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)
Index: kaffe/tools/javatools/Makefile.in
diff -u kaffe/tools/javatools/Makefile.in:1.36 kaffe/tools/javatools/Makefile.in:1.37
--- kaffe/tools/javatools/Makefile.in:1.36	Sun Jan  7 22:14:50 2007
+++ kaffe/tools/javatools/Makefile.in	Mon Jan  8 00:16:29 2007
@@ -289,7 +289,6 @@
 toolslib_DATA = $(CLASSFILE)
 LIBDIR = lib
 JAR_CMD1 = ($(FASTJAR) cf $(CLASSFILE) -C $(LIBDIR) $(SRCDIRS))
-JAR_CMD2 = ($(FASTJAR) uf $(CLASSFILE) -C $(srcdir) org)
 CPATH = .:$(LIBDIR):$(GLIBJ_ZIP)
 AM_JAVACFLAGS = -classpath $(CPATH)
 JAVAC = $(JAVA_COMPILER)
@@ -573,7 +572,6 @@
 $(CLASSFILE): classdist_tools.stamp
 	rm -f $(CLASSFILE)
 	$(JAR_CMD1)
-	$(JAR_CMD2)
 
 clean-local:
 	rm -rf $(LIBDIR) $(CLASSFILE)