Mercurial > hg > release > icedtea7-2.0
changeset 2181:a389f4a8658c
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 | Fri, 28 May 2010 17:22:46 +0100 |
| parents | d12fd1d4a26e |
| children | cc07055da3e2 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 28 17:16:40 2010 +0100 +++ b/ChangeLog Fri May 28 17:22:46 2010 +0100 @@ -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 Fri May 28 17:16:40 2010 +0100 +++ b/Makefile.am Fri May 28 17:22:46 2010 +0100 @@ -1816,9 +1816,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 @@ -1900,9 +1900,9 @@ endif endif if ENABLE_PULSE_JAVA - cp -pPRf libpulse-java.so \ + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf libpulse-java.so \ + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) cp -pPRf pulse-java.jar \ $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext @@ -2264,7 +2264,6 @@ [ -z "$(PULSE_JAVA_NATIVE_BUILDDIR)" ] || rm -rf $(PULSE_JAVA_NATIVE_BUILDDIR) [ -z "$(PULSE_JAVA_CLASS_DIR)" ] || rm -rf $(PULSE_JAVA_CLASS_DIR) rm -f pulse-java.jar - rm -f libpulse-java.so if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \ rmdir $(abs_top_builddir)/pulseaudio ; \ fi