[cairo-commit] cairo-java ChangeLog, 1.85, 1.86 Makefile.am, 1.24, 1.25

[Andrew Frederick Cowie]

Committed by: afcowie

Update of /cvs/cairo/cairo-java
In directory gabe:/tmp/cvs-serv22140

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Revert mistakenly added else clause in commit of 28 Nov 05. Reported,
isolated and fixed by Remy Suen <remy.suen at gmail.com>


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- ChangeLog	2 Dec 2005 10:36:58 -0000	1.85
+++ ChangeLog	4 Dec 2005 04:58:38 -0000	1.86
@@ -1,8 +1,13 @@
-2005-12-02  Andrew Cowie  <andrew at operationaldynamics.com>
+2005-12-04  Andrew Cowie  <andrew at operationaldynamics.com>
+
+	* Makefile.am:
+	Revert mistakenly added else clause in commit of 28 Nov 05. Reported,
+	isolated and fixed by Remy Suen <remy.suen at gmail.com>
+
+2005-12-02  Ismael Juma  <ismael at juma.me.uk>
 
 	* src/java/org/freedesktop/cairo/Context.java:
 	* src/jni/org_freedesktop_cairo_Context.c:
-	
 	Fix bug #5208 (Context.getMatrix() fails) and also fix object being passed
 	to getPointerFromHandle.
 

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Makefile.am	28 Nov 2005 17:56:02 -0000	1.24
+++ Makefile.am	4 Dec 2005 04:58:38 -0000	1.25
@@ -74,11 +74,11 @@
 libcairojava_la_SOURCES = $(java_cairo_source_files)
 libcairojava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(JGJAR):$(srcdir)/src/java
 libcairojava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
-else
+endif
+
 libcairojni_la_SOURCES = $(jni_cairo_source_files)
 libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES)
 libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
-endif
 
 # automake should support generating versioned jars
 cairo_jardir = $(jardir)