[cairo-commit] cairo-java autogen.sh, 1.1, 1.2 configure.ac, 1.3, 1.4 ChangeLog, 1.25, 1.26 .cvsignore, 1.2, 1.3 .classpath, 1.3, 1.4 Makefile.am, 1.2, 1.3

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	autogen.sh configure.ac ChangeLog .cvsignore .classpath 
	Makefile.am 
Log Message:
changes to use new java-gnome utility library

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo-java/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autogen.sh	23 Feb 2005 18:17:52 -0000	1.1
+++ autogen.sh	24 Mar 2005 18:11:40 -0000	1.2
@@ -68,8 +68,8 @@
 
 libtoolize --force || exit $?
 
-GTKJAVA_MACROS=`pkg-config --variable macro_dir gtk2-java`
-aclocal -I $GTKJAVA_MACROS
+JAVAGNOME_MACROS=`pkg-config --variable macro_dir java-gnome`
+aclocal -I $JAVAGNOME_MACROS
 
 
 $AUTOMAKE --add-missing || exit $?

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-java/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac	10 Mar 2005 19:38:33 -0000	1.3
+++ configure.ac	24 Mar 2005 18:11:40 -0000	1.4
@@ -42,8 +42,7 @@
 AC_SUBST(INSTALLED_CLASSPATH_BUILDPLACE)
 AC_SUBST(INSTALLED_JNI_DIR_BUILDPLACE)
 
-JG_GTK_JAVA(2.6)
-
+JG_LIB
 JG_COMMON
 AM_PROG_CC_C_O
 

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ChangeLog	21 Mar 2005 20:24:45 -0000	1.25
+++ ChangeLog	24 Mar 2005 18:11:40 -0000	1.26
@@ -1,3 +1,34 @@
+2005-03-24  Jeffrey Morgan  <kuzman at gmail.com>
+
+	* Makefile.am:
+	* autogen.sh:
+	* configure.ac:
+	* src/java/org/freedesktop/cairo/Cairo.java:
+	* src/java/org/freedesktop/cairo/CairoObject.java:
+	* src/java/org/freedesktop/cairo/Extend.java:
+	* src/java/org/freedesktop/cairo/FillRule.java:
+	* src/java/org/freedesktop/cairo/Filter.java:
+	* src/java/org/freedesktop/cairo/Font.java:
+	* src/java/org/freedesktop/cairo/FontExtents.java:
+	* src/java/org/freedesktop/cairo/FontSlant.java:
+	* src/java/org/freedesktop/cairo/FontWeight.java:
+	* src/java/org/freedesktop/cairo/Format.java:
+	* src/java/org/freedesktop/cairo/FreetypeFont.java:
+	* src/java/org/freedesktop/cairo/Glyph.java:
+	* src/java/org/freedesktop/cairo/ImageSurface.java:
+	* src/java/org/freedesktop/cairo/LineCap.java:
+	* src/java/org/freedesktop/cairo/LineJoin.java:
+	* src/java/org/freedesktop/cairo/Matrix.java:
+	* src/java/org/freedesktop/cairo/Operator.java:
+	* src/java/org/freedesktop/cairo/Pattern.java:
+	* src/java/org/freedesktop/cairo/PdfSurface.java:
+	* src/java/org/freedesktop/cairo/PngSurface.java:
+	* src/java/org/freedesktop/cairo/PsSurface.java:
+	* src/java/org/freedesktop/cairo/Status.java:
+	* src/java/org/freedesktop/cairo/Surface.java:
+	* src/java/org/freedesktop/cairo/TextExtents.java:
+	changes to use new java-gnome utility library
+
 2005-03-21  Jeffrey Morgan  <kuzman at gmail.com>
 
 	* .classpath: changed java-gnome dependency to libgtk-java

Index: .cvsignore
===================================================================
RCS file: /cvs/cairo/cairo-java/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- .cvsignore	25 Feb 2005 20:17:27 -0000	1.2
+++ .cvsignore	24 Mar 2005 18:11:40 -0000	1.3
@@ -19,3 +19,4 @@
 Makefile
 Makefile.in
 missing
+cairo0.4.jar

Index: .classpath
===================================================================
RCS file: /cvs/cairo/cairo-java/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .classpath	21 Mar 2005 20:24:45 -0000	1.3
+++ .classpath	24 Mar 2005 18:11:40 -0000	1.4
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="src/jni"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="src" path="/libgtk-java"/>
+	<classpathentry kind="src" path="/java-gnome"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	8 Mar 2005 20:47:44 -0000	1.2
+++ Makefile.am	24 Mar 2005 18:11:40 -0000	1.3
@@ -61,13 +61,13 @@
 if BUILD_GCJ
 libcairojava_la_SOURCES = $(java_cairo_source_files)
 nodist_libcairojava_la_SOURCES = src/java/org/freedesktop/cairo/Config.java
-libcairojava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(GTKJAR):$(srcdir)/src/java
-libcairojava_la_LDFLAGS = $(GTKJAVA_LIBS) -release $(apiversion)
+libcairojava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(JGJAR):$(srcdir)/src/java
+libcairojava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
 endif
 
 libcairojni_la_SOURCES = $(jni_cairo_source_files)
-libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTK_CFLAGS) $(GTKJAVA_CFLAGS) -I$(includedir)
-libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(GTKJNI_LIBS) -release $(apiversion)
+libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir)
+libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
 
 # automake should support generating versioned jars
 cairo_jardir = $(jardir)
@@ -76,7 +76,7 @@
 cairo_jar_class_files = $(java_cairo_source_files:.java=.class)
 
 $(cairo_jar_class_files): %.class: %.java
-	$(JAVAC) -classpath $(GTKJAR):$(srcdir)/src/java:src/java -d src/java $<
+	$(JAVAC) -classpath $(JGJAR):$(srcdir)/src/java:src/java -d src/java $<
 
 # all_cairo_jar_class_files includes inner-class generated .class files
 # the sed command protects dollar signs in file names from shell expansion
@@ -117,7 +117,7 @@
 # install other docs
 docdir = $(datadir)/doc/cairo-java-$(VERSION)
 doc_DATA = $(srcdir)/AUTHORS $(srcdir)/COPYING \
-	$(srcdir)/NEWS $(srcdir)/README 
+	$(srcdir)/NEWS $(srcdir)/README $(srcdir)/INSTALL
 
 all_dest_cairo_javadoc_html_files = $(patsubst doc/api/%.html,%.html,$(shell find doc/api -name '*.html'))
 dest_cairo_javadoc_dirs = $(patsubst doc/api/%,%,$(shell find doc/api -mindepth 1 -type d))