Mercurial > hg > release > icedtea6-1.11

changeset 1940:cba544e79a99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Refer to libpulse-java.so with full path to native build directory. 2010-02-24 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: (icedtea.stamp): Prefix libpulse-java.so with build directory path. (icedtea-debug.stamp): Likewise. (clean-pulse-java): No need to delete libpulse-java.so as no longer at top-level.
author Andrew John Hughes <ahughes@redhat.com>
date Wed, 24 Feb 2010 18:52:44 +0000
parents 25ad23f47dfd
children 04345d27c594
files ChangeLog Makefile.am
diffstat 2 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Feb 24 17:45:42 2010 +0000
+++ b/ChangeLog	Wed Feb 24 18:52:44 2010 +0000
@@ -1,3 +1,12 @@
+2010-02-24 Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	(icedtea.stamp): Prefix libpulse-java.so with
+	build directory path.
+	(icedtea-debug.stamp): Likewise.
+	(clean-pulse-java): No need to delete libpulse-java.so
+	as no longer at top-level.
+
 2010-02-24 Andrew John Hughes  <ahughes@redhat.com>
 
 	* pulseaudio/src/native/org_classpath_icedtea_pulseaudio_PulseAudioStreamVolumeControl.c:
--- a/Makefile.am	Wed Feb 24 17:45:42 2010 +0000
+++ b/Makefile.am	Wed Feb 24 18:52:44 2010 +0000
@@ -1340,9 +1340,9 @@
 endif
 endif
 if ENABLE_PULSE_JAVA
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext
@@ -1441,9 +1441,9 @@
 endif
 endif
 if ENABLE_PULSE_JAVA
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)
-	cp -pPRf libpulse-java.so \
+	cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \
 	  $(BUILD_OUTPUT_DIR)-debug/j2re-image/lib/$(INSTALL_ARCH_DIR)
 	cp -pPRf pulse-java.jar \
 	  $(BUILD_OUTPUT_DIR)-debug/j2sdk-image/jre/lib/ext
@@ -1759,7 +1759,6 @@
 	[ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR)
 	rm -f stamps/pulse-java*.stamp
 	rm -f pulse-java.jar
-	rm -f libpulse-java.so
 endif
 
 # end of pulse-java