[cairo-commit] cairo-java ChangeLog, 1.92, 1.93 Makefile.am, 1.27, 1.28 autogen.sh, 1.6, 1.7

[Adam Jocksch]

Committed by: ajocksch

Update of /cvs/cairo/cairo-java
In directory kemper:/tmp/cvs-serv19736

Modified Files:
	ChangeLog Makefile.am autogen.sh 
Log Message:
2006-02-28  Adam Jocksch  <ajocksch at redhat.com>

	* Makefile.am (AM_CFLAGS): Added include to fix out of tree builds.
	* autogen.sh: Fixed classpath for header generation to fix out of
	tree builds.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- ChangeLog	28 Feb 2006 17:54:31 -0000	1.92
+++ ChangeLog	28 Feb 2006 18:22:07 -0000	1.93
@@ -1,4 +1,10 @@
-2006-02-28  Adam Jocksch  <ajocksch at toothpaste.toronto.redhat.com>
+2006-02-28  Adam Jocksch  <ajocksch at redhat.com>
+
+	* Makefile.am (AM_CFLAGS): Added include to fix out of tree builds.
+	* autogen.sh: Fixed classpath for header generation to fix out of
+	tree builds.
+
+2006-02-28  Adam Jocksch  <ajocksch at redhat.com>
 
 	* Makefile.am (AM_CFLAGS): Removed -W* flags from AM_CFLAGS.
 	

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- Makefile.am	28 Feb 2006 17:54:31 -0000	1.27
+++ Makefile.am	28 Feb 2006 18:22:07 -0000	1.28
@@ -78,7 +78,7 @@
 endif
 
 libcairojni_la_SOURCES = $(jni_cairo_source_files)
-AM_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES)
+AM_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES) -Isrc/jni
 libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
 
 # automake should support generating versioned jars

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/cairo-java/autogen.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- autogen.sh	28 Feb 2006 17:51:37 -0000	1.6
+++ autogen.sh	28 Feb 2006 18:22:07 -0000	1.7
@@ -80,7 +80,7 @@
     cat <<EOF
 jni_cairo_source_files += $f
 $h: src/java/`echo $b | sed -e 's,_,/,g'`.class
-	\$(JAVAH) -o \$@ -classpath \$(CLASSPATH):\$(srcdir)/src/java $c
+	\$(JAVAH) -o \$@ -classpath \$(CLASSPATH):src/java $c
 $d/$b.lo: $h
 CLEANFILES += $h
 EOF