/hg/icedtea6: Make sure PulseAudio headers are picked up by addi...

[andrew at icedtea.classpath.org]

changeset 04345d27c594 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=04345d27c594
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 24 20:22:15 2010 +0000

	Make sure PulseAudio headers are picked up by adding
	-I$(PULSE_JAVA_NATIVE_BUILDDIR)

	2010-02-24 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Add missing pulse-java alias and
	reorganise existing aliases alphabetically.
	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include directive
	for build directory to pick up generated headers.


diffstat:

2 files changed, 28 insertions(+), 17 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |   36 +++++++++++++++++++-----------------

diffs (96 lines):

diff -r cba544e79a99 -r 04345d27c594 ChangeLog
--- a/ChangeLog	Wed Feb 24 18:52:44 2010 +0000
+++ b/ChangeLog	Wed Feb 24 20:22:15 2010 +0000
@@ -1,3 +1,12 @@ 2010-02-24 Andrew John Hughes  <ahughes@
+2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Add missing pulse-java alias and reorganise
+	existing aliases alphabetically.
+	($(PULSE_JAVA_NATIVE_BUILDDIR)/%.o): Add include
+	directive for build directory to pick up generated
+	headers.
+
 2010-02-24 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r cba544e79a99 -r 04345d27c594 Makefile.am
--- a/Makefile.am	Wed Feb 24 18:52:44 2010 +0000
+++ b/Makefile.am	Wed Feb 24 20:22:15 2010 +0000
@@ -1707,7 +1707,7 @@ if ENABLE_PULSE_JAVA
 $(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
 	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
 	$(CC) $(CFLAGS) -fPIC -I$(ICEDTEA_BOOT_DIR)/include/linux -I$(ICEDTEA_BOOT_DIR)/include \
-	 -o $@ -c $<
+	 -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
 
 $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
 	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
@@ -2199,7 +2199,7 @@ bootstrap-directory-symlink: stamps/boot
 
 cacao: stamps/cacao.stamp
 
-visualvm: stamps/visualvm.stamp
+clean: distclean-local
 
 nbplatform: stamps/nbplatform.stamp
 
@@ -2217,6 +2217,8 @@ extract: stamps/extract.stamp
 
 extract-ecj: stamps/extract-ecj.stamp
 
+hotspot-ports: stamps/ports.stamp
+
 icedtea: stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp
 
 icedtea-against-ecj: stamps/icedtea-against-ecj.stamp
@@ -2225,34 +2227,34 @@ icedtea-debug: stamps/icedtea-debug.stam
 
 icedtea-ecj: stamps/icedtea-ecj.stamp
 
+jtreg: stamps/jtreg.stamp
+
 native-ecj: stamps/native-ecj.stamp
+
+overlay: stamps/overlay.stamp
+
+patch: stamps/patch.stamp
 
 patch-ecj: stamps/patch-ecj.stamp
 
-patch: stamps/patch.stamp
-
 patch-fsg: stamps/patch-fsg.stamp
 
-overlay: stamps/overlay.stamp
+plugin: stamps/plugin.stamp
+
+plugin-tests: stamps/plugin-tests.stamp
+
+plugs: stamps/plugs.stamp
+
+pulse-java: stamps/pulse-java.stamp
 
 rewriter: stamps/rewriter.stamp
 
 rewrite-rhino: stamps/rewrite-rhino.stamp
 
-plugs: stamps/plugs.stamp
+replace-hotspot: stamps/replace-hotspot.stamp
 
 rt-jar: stamps/rt.stamp
 
 rt-class-files: stamps/rt-class-files.stamp
 
-replace-hotspot: stamps/replace-hotspot.stamp
-
-hotspot-ports: stamps/ports.stamp
-
-clean: distclean-local
-
-jtreg: stamps/jtreg.stamp
-
-plugin: stamps/plugin.stamp
-
-plugin-tests: stamps/plugin-tests.stamp
+visualvm: stamps/visualvm.stamp