--- a/ChangeLog	Thu Jun 12 00:42:40 2014 +0100
+++ b/ChangeLog	Wed Jul 16 15:39:24 2014 +0100
@@ -1,3 +1,38 @@
+2014-07-16  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	PR1840: Replace Makefile.am references to PULSE_JAVA
+	with ICEDTEA_SOUND
+	* Makefile.am:
+	(ICEDTEA_SOUND_DIR): Renamed from PULSE_JAVA_DIR.
+	(ICEDTEA_SOUND_NATIVE_SRCDIR): Renamed from PULSE_JAVA_NATIVE_SRCDIR.
+	(ICEDTEA_SOUND_NATIVE_SRCS): Renamed from PULSE_JAVA_NATIVE_SRCS.
+	(ICEDTEA_SOUND_JAVA_SRCDIR): Renamed from PULSE_JAVA_JAVA_SRCDIR.
+	(ICEDTEA_SOUND_BUILDDIR): Renamed from PULSE_JAVA_BUILDDIR.
+	(ICEDTEA_SOUND_NATIVE_BUILDDIR): Renamed from PULSE_JAVA_NATIVE_BUILDDIR.
+	(ICEDTEA_SOUND_NATIVE_OBJECTS): Renamed from PULSE_JAVA_NATIVE_OBJECTS.
+	(ICEDTEA_SOUND_CLASS_DIR): Renamed from PULSE_JAVA_CLASS_DIR.
+	(ICEDTEA_SOUND_JAVA_SRCS): Renamed from PULSEAUDIO_JAVA_SRCS.
+	(ICEDTEA_SOUND_SRCS): Renamed from PULSEAUDIO_SRCS.
+	(EXTRA_DIST): Updated.
+	(all-local): Likewise.
+	(clean-local): Likewise.
+	(.PHONY): Likewise.
+	(install-exec-local): Likewise.
+	(install-data-local): Likewise.
+	(uninstall-local): Likewise.
+	(icedtea-sound): Renamed from pulse-java.
+	(icedtea-sound-class): Renamed from pulse-java-class.
+	(icedtea-sound-jar): Renamed from pulse-java-jar.
+	(icedtea-sound-headers): Renamed from pulse-java-headers.
+	($(ICEDTEA_SOUND_NATIVE_BUILDDIR)/%.o): Renamed from
+	$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o
+	($(ICEDTEA_SOUND_NATIVE_BUILDDIR)/libicedtea-sound.so):
+	Renamed from $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so.
+	(clean-icedtea-sound): Renamed from clean-pulse-java.
+	(docs): Updated.
+	* NEWS: Updated.
+	* README: List class name of PulseAudio provider.
+
 2014-06-11  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	PR1741: Break PulseAudio provider out into IcedTea-Sound

--- a/Makefile.am	Thu Jun 12 00:42:40 2014 +0100
+++ b/Makefile.am	Wed Jul 16 15:39:24 2014 +0100
@@ -18,23 +18,23 @@
 # 02110-1301 USA.
 
 # Source directories
-PULSE_JAVA_DIR = $(abs_top_srcdir)
-PULSE_JAVA_NATIVE_SRCDIR = $(PULSE_JAVA_DIR)/src/native
-PULSE_JAVA_NATIVE_SRCS = $(wildcard $(PULSE_JAVA_NATIVE_SRCDIR)/*.c)
-PULSE_JAVA_JAVA_SRCDIR = $(PULSE_JAVA_DIR)/src/java
+ICEDTEA_SOUND_DIR = $(abs_top_srcdir)
+ICEDTEA_SOUND_NATIVE_SRCDIR = $(ICEDTEA_SOUND_DIR)/src/native
+ICEDTEA_SOUND_NATIVE_SRCS = $(wildcard $(ICEDTEA_SOUND_NATIVE_SRCDIR)/*.c)
+ICEDTEA_SOUND_JAVA_SRCDIR = $(ICEDTEA_SOUND_DIR)/src/java
 
 # Build directories
 RUNTIME = $(SYSTEM_JDK_DIR)/jre/lib/rt.jar
-PULSE_JAVA_BUILDDIR = $(abs_top_builddir)/pulseaudio.build
-PULSE_JAVA_NATIVE_BUILDDIR = $(PULSE_JAVA_BUILDDIR)/native
-PULSE_JAVA_NATIVE_OBJECTS = \
-	$(subst $(PULSE_JAVA_NATIVE_SRCDIR),$(PULSE_JAVA_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(PULSE_JAVA_NATIVE_SRCS)))
-PULSE_JAVA_CLASS_DIR = $(PULSE_JAVA_BUILDDIR)/classes
+ICEDTEA_SOUND_BUILDDIR = $(abs_top_builddir)/build
+ICEDTEA_SOUND_NATIVE_BUILDDIR = $(ICEDTEA_SOUND_BUILDDIR)/native
+ICEDTEA_SOUND_NATIVE_OBJECTS = \
+	$(subst $(ICEDTEA_SOUND_NATIVE_SRCDIR),$(ICEDTEA_SOUND_NATIVE_BUILDDIR),$(patsubst %.c,%.o,$(ICEDTEA_SOUND_NATIVE_SRCS)))
+ICEDTEA_SOUND_CLASS_DIR = $(ICEDTEA_SOUND_BUILDDIR)/classes
 
 # Files
 # Must use relative paths so as not to break make distcheck
-PULSEAUDIO_JAVA_SRCS = $(top_srcdir)/src/java/org/classpath/icedtea/*/*.java
-PULSEAUDIO_SRCS = $(PULSEAUDIO_JAVA_SRCS) \
+ICEDTEA_SOUND_JAVA_SRCS = $(top_srcdir)/src/java/org/classpath/icedtea/*/*.java
+ICEDTEA_SOUND_SRCS = $(ICEDTEA_SOUND_JAVA_SRCS) \
 	$(top_srcdir)/src/java/META-INF/services/javax.sound.sampled.spi.MixerProvider \
 	$(top_srcdir)/src/native/*.h \
 	$(top_srcdir)/src/native/*.c \
@@ -43,7 +43,7 @@
 	$(top_srcdir)/testsounds/logout.wav \
 	$(top_srcdir)/testsounds/error.wav \
 	$(top_srcdir)/unittests/org/classpath/icedtea/*/*.java
-EXTRA_DIST = $(PULSEAUDIO_SRCS)
+EXTRA_DIST = $(ICEDTEA_SOUND_SRCS)
 
 # Flags
 IT_LANGUAGE_SOURCE_VERSION=6
@@ -63,22 +63,22 @@
 # Top-Level Targets
 # =================
 
-all-local: stamps/pulse-java.stamp stamps/docs.stamp
+all-local: stamps/icedtea-sound.stamp stamps/docs.stamp
 
-clean-local: clean-pulse-java clean-docs
+clean-local: clean-icedtea-sound clean-docs
 	rm -f $(abs_top_builddir)/src.zip
 	if [ -e stamps ] ; then rmdir stamps ; fi
 
-.PHONY: clean-pulse-java
+.PHONY: clean-icedtea-sound
 
 install-exec-local:
 	${mkinstalldirs} $(DESTDIR)$(libdir)
-	${INSTALL_PROGRAM} $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so $(DESTDIR)$(libdir)
+	${INSTALL_PROGRAM} $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/libicedtea-sound.so $(DESTDIR)$(libdir)
 
 install-data-local:
 	${mkinstalldirs} $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/
-	${INSTALL_DATA} pulse-java.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
-	(cd $(PULSE_JAVA_JAVA_SRCDIR) && \
+	${INSTALL_DATA} icedtea-sound.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
+	(cd $(ICEDTEA_SOUND_JAVA_SRCDIR) && \
 	   $(ZIP) -qr $(abs_top_builddir)/src.zip org )
 	${INSTALL_DATA} src.zip $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
 if ENABLE_DOCS
@@ -91,68 +91,68 @@
 endif
 
 uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/libpulse-java.so
-	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/pulse-java.jar
+	rm -f $(DESTDIR)$(libdir)/libicedtea-sound.so
+	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/icedtea-sound.jar
 	rm -f $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/src.zip
 	rmdir $(DESTDIR)$(datadir)/$(PACKAGE_NAME)
 	rm -rf $(DESTDIR)$(htmldir)
 
-stamps/pulse-java.stamp: stamps/pulse-java-jar.stamp $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
+stamps/icedtea-sound.stamp: stamps/icedtea-sound-jar.stamp $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/libicedtea-sound.so
 	mkdir -p stamps
 	touch $@
 
-stamps/pulse-java-class.stamp:
-	mkdir -p $(PULSE_JAVA_CLASS_DIR)
-	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(PULSE_JAVA_CLASS_DIR) \
-	 -bootclasspath $(RUNTIME) $(PULSEAUDIO_JAVA_SRCS)
-	cp  -r $(PULSE_JAVA_JAVA_SRCDIR)/META-INF $(PULSE_JAVA_CLASS_DIR)
-	chmod -R ug+w $(PULSE_JAVA_CLASS_DIR)/META-INF
+stamps/icedtea-sound-class.stamp:
+	mkdir -p $(ICEDTEA_SOUND_CLASS_DIR)
+	$(abs_top_builddir)/javac $(IT_JAVACFLAGS) -d $(ICEDTEA_SOUND_CLASS_DIR) \
+	 -bootclasspath $(RUNTIME) $(ICEDTEA_SOUND_JAVA_SRCS)
+	cp  -r $(ICEDTEA_SOUND_JAVA_SRCDIR)/META-INF $(ICEDTEA_SOUND_CLASS_DIR)
+	chmod -R ug+w $(ICEDTEA_SOUND_CLASS_DIR)/META-INF
 	mkdir -p stamps
 	touch $@
 
-stamps/pulse-java-jar.stamp: stamps/pulse-java-class.stamp
-	$(JAR) cf pulse-java.jar -C $(PULSE_JAVA_CLASS_DIR) .;
+stamps/icedtea-sound-jar.stamp: stamps/icedtea-sound-class.stamp
+	$(JAR) cf icedtea-sound.jar -C $(ICEDTEA_SOUND_CLASS_DIR) .;
 	mkdir -p stamps
 	touch $@
 
-stamps/pulse-java-headers.stamp: stamps/pulse-java-class.stamp
-	mkdir -p $(PULSE_JAVA_NATIVE_BUILDDIR)
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
-	$(JAVAH) -d $(PULSE_JAVA_NATIVE_BUILDDIR) -classpath $(PULSE_JAVA_CLASS_DIR) \
-	  -J-Xbootclasspath/p:$(PULSE_JAVA_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
+stamps/icedtea-sound-headers.stamp: stamps/icedtea-sound-class.stamp
+	mkdir -p $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.EventLoop ; \
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Stream ; \
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.Operation; \
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioSourcePort ; \
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.PulseAudioTargetPort ; \
+	$(JAVAH) -d $(ICEDTEA_SOUND_NATIVE_BUILDDIR) -classpath $(ICEDTEA_SOUND_CLASS_DIR) \
+	  -J-Xbootclasspath/p:$(ICEDTEA_SOUND_CLASS_DIR) org.classpath.icedtea.pulseaudio.ContextEvent
 	mkdir -p stamps
 	touch $@
 
-$(PULSE_JAVA_NATIVE_BUILDDIR)/%.o: $(PULSE_JAVA_NATIVE_SRCDIR)/%.c stamps/pulse-java-headers.stamp
+$(ICEDTEA_SOUND_NATIVE_BUILDDIR)/%.o: $(ICEDTEA_SOUND_NATIVE_SRCDIR)/%.c stamps/icedtea-sound-headers.stamp
 	$(CC) $(IT_CFLAGS) -fPIC -I$(SYSTEM_JDK_DIR)/include/linux -I$(SYSTEM_JDK_DIR)/include \
-	 -I$(PULSE_JAVA_NATIVE_BUILDDIR) -o $@ -c $<
+	 -I$(ICEDTEA_SOUND_NATIVE_BUILDDIR) -o $@ -c $<
 
-$(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so: $(PULSE_JAVA_NATIVE_OBJECTS)
-	$(CC) $(LDFLAGS) -shared $(PULSE_JAVA_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
-	 -o $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so
+$(ICEDTEA_SOUND_NATIVE_BUILDDIR)/libicedtea-sound.so: $(ICEDTEA_SOUND_NATIVE_OBJECTS)
+	$(CC) $(LDFLAGS) -shared $(ICEDTEA_SOUND_NATIVE_OBJECTS) $(LIBPULSE_LIBS) \
+	 -o $(ICEDTEA_SOUND_NATIVE_BUILDDIR)/libicedtea-sound.so
 
-clean-pulse-java:
-	rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR)
-	rm -rf $(PULSE_JAVA_CLASS_DIR)
-	rm -f pulse-java.jar
-	if [ -e $(PULSE_JAVA_BUILDDIR) ]; then \
-	  rmdir $(PULSE_JAVA_BUILDDIR) ; \
+clean-icedtea-sound:
+	rm -rf $(ICEDTEA_SOUND_NATIVE_BUILDDIR)
+	rm -rf $(ICEDTEA_SOUND_CLASS_DIR)
+	rm -f icedtea-sound.jar
+	if [ -e $(ICEDTEA_SOUND_BUILDDIR) ]; then \
+	  rmdir $(ICEDTEA_SOUND_BUILDDIR) ; \
 	fi
-	rm -f stamps/pulse-java*.stamp
+	rm -f stamps/icedtea-sound*.stamp
 
 stamps/docs.stamp:
 if ENABLE_DOCS
 	$(JAVADOC) $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \
-	 -d ${abs_top_builddir}/docs -sourcepath $(PULSE_JAVA_JAVA_SRCDIR) \
+	 -d ${abs_top_builddir}/docs -sourcepath $(ICEDTEA_SOUND_JAVA_SRCDIR) \
 	 -doctitle 'IcedTea-Sound: API Specification' \
 	 -windowtitle 'IcedTea-Sound' \
 	 -header '<strong>IcedTea-Sound</strong>' \

--- a/NEWS	Thu Jun 12 00:42:40 2014 +0100
+++ b/NEWS	Wed Jul 16 15:39:24 2014 +0100
@@ -34,3 +34,4 @@
 New in release 1.0.0 (2014-XX-XX):
 
 * PR1741: Break PulseAudio provider out into IcedTea-Sound
+* PR1840: Replace Makefile.am references to PULSE_JAVA with ICEDTEA_SOUND

--- a/README	Thu Jun 12 00:42:40 2014 +0100
+++ b/README	Wed Jul 16 15:39:24 2014 +0100
@@ -23,7 +23,8 @@
 A collection of audio SPI implementations for Java, including:
 
  * the use of PulseAudio as a mixer 
-  (so as a bonus you get all of the ear candy that PulseAudio provides)
+   org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider
+   (so as a bonus you get all of the ear candy that PulseAudio provides)
 
 How to Build?
 =============