Mercurial > hg > release > icedtea6-1.13
changeset 2269:36fac414f1b4
Separate PulseAudio addition into separate targets.
2010-09-23 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(.PHONY): Add clean-add-pulseaudio and
clean-add-pulseaudio-debug.
(clean-local): Likewise.
(icedtea): Remove pulse-java support and dependency.
(icedtea-debug): Likewise.
(icedtea-against-icedtea): Depend on add-pulseaudio.
(icedtea-debug-against-icedtea): Depend on add-pulseaudio-debug.
(add-systemtap-debug): Dependency should be icedtea-debug.
(add-pulseaudio): New target to add PulseAudio support to the build.
(add-pulseaudio-debug): Likewise for debug.
(clean-add-pulseaudio): Remove PulseAudio support from the build.
(clean-add-pulseaudio-debug): Likewise for debug.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 23 Sep 2010 11:51:33 +0100 |
parents | fd61403cdd41 |
children | 65ab89d428ac |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 73 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Sep 22 17:56:27 2010 +0100 +++ b/ChangeLog Thu Sep 23 11:51:33 2010 +0100 @@ -1,9 +1,26 @@ +2010-09-23 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (.PHONY): Add clean-add-pulseaudio and + clean-add-pulseaudio-debug. + (clean-local): Likewise. + (icedtea): Remove pulse-java support and dependency. + (icedtea-debug): Likewise. + (icedtea-against-icedtea): Depend on add-pulseaudio. + (icedtea-debug-against-icedtea): Depend on add-pulseaudio-debug. + (add-systemtap-debug): Dependency should be icedtea-debug. + (add-pulseaudio): New target to add PulseAudio support to the build. + (add-pulseaudio-debug): Likewise for debug. + (clean-add-pulseaudio): Remove PulseAudio support from the build. + (clean-add-pulseaudio-debug): Likewise for debug. + 2010-09-22 Andrew John Hughes <ahughes@redhat.com> Move SystemTap support to a separate target. * Makefile.am: (.PHONY): Add clean-add-systemtap and clean-add-systemtap-debug. + (clean-local): Likewise. (icedtea): Remove systemtap support. (icedtea-debug): Likewise. (icedtea-against-icedtea): Depend on add-systemtap.
--- a/Makefile.am Wed Sep 22 17:56:27 2010 +0100 +++ b/Makefile.am Thu Sep 23 11:51:33 2010 +0100 @@ -555,7 +555,8 @@ clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \ clean-rewriter clean-rewrite-rhino clean-extra clean-rt clean-bootstrap-directory \ clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \ - clean-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug + clean-bootstrap-directory-symlink-ecj clean-add-systemtap clean-add-systemtap-debug \ + clean-add-pulseaudio clean-add-pulseaudio-debug if [ -e bootstrap ]; then \ rmdir bootstrap ; \ fi @@ -588,8 +589,8 @@ clean-ports clean-overlay clean-extract-ecj clean-extract clean-extract-openjdk \ clean-replace-hotspot clean-generated clean-download clean-hgforest clean-download-openjdk \ clean-rewriter clean-rewrite-rhino clean-add-netx clean-add-netx-debug \ - clean-add-plugin clean-add-plugin-debug clean-add-systemtap clean-add-systemtap-debug - + clean-add-plugin clean-add-plugin-debug clean-add-systemtap clean-add-systemtap-debug \ + clean-add-pulseaudio clean-add-pulseaudio-debug env: @echo 'unset JAVA_HOME' @echo 'export $(ICEDTEA_ENV)' @@ -1247,7 +1248,7 @@ # If you change anything here in the icedtea target, please make sure # you change it in the icedtea-debug target as well. stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ - $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1256,18 +1257,6 @@ mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PULSE_JAVA - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ - $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext - cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ - $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext - (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif @@ -1292,7 +1281,7 @@ rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \ - $(OPENJDK_TREE) stamps/cacao.stamp $(PULSE_JAVA_TARGET) stamps/rewrite-rhino.stamp + $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp $(ARCH_PREFIX) $(MAKE) \ $(ICEDTEA_ENV) \ -C openjdk \ @@ -1301,18 +1290,6 @@ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext -if ENABLE_PULSE_JAVA - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) - cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext - cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ - $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext - (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ - $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) -endif if ZERO_BUILD printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif @@ -1339,7 +1316,7 @@ stamps/icedtea-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/icedtea.stamp stamps/add-cacao.stamp stamps/add-zero.stamp stamps/add-plugin.stamp \ - stamps/add-netx.stamp stamps/add-systemtap.stamp + stamps/add-netx.stamp stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp mkdir -p stamps touch stamps/icedtea-against-icedtea.stamp @@ -1348,7 +1325,8 @@ stamps/icedtea-debug-against-icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \ stamps/icedtea-debug.stamp stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp \ - stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp stamps/add-systemtap-debug.stamp + stamps/add-plugin-debug.stamp stamps/add-netx-debug.stamp stamps/add-systemtap-debug.stamp \ + stamps/add-pulseaudio-debug.stamp mkdir -p stamps touch stamps/icedtea-debug-against-icedtea.stamp @@ -1474,7 +1452,7 @@ rm -rf $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset rm -f stamps/add-systemtap.stamp -stamps/add-systemtap-debug.stamp: stamps/icedtea.stamp +stamps/add-systemtap-debug.stamp: stamps/icedtea-debug.stamp if ENABLE_SYSTEMTAP mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ @@ -1500,6 +1478,52 @@ rm -rf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset rm -f stamps/add-systemtap-debug.stamp +stamps/add-pulseaudio.stamp: stamps/icedtea.stamp $(PULSE_JAVA_TARGET) +if ENABLE_PULSE_JAVA + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ + $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext + cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ + $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) +endif + touch stamps/add-pulseaudio.stamp + +# Note: for simplicity, we don't revert the update of src.zip +clean-add-pulseaudio: + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar + rm -f $(BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar + rm -f stamps/add-pulseaudio.stamp + +stamps/add-pulseaudio-debug.stamp: stamps/icedtea-debug.stamp $(PULSE_JAVA_TARGET) +if ENABLE_PULSE_JAVA + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_NATIVE_BUILDDIR)/libpulse-java.so \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR) + cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext + cp -pPRf $(PULSE_JAVA_BUILDDIR)/pulse-java.jar \ + $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext + (cd $(PULSE_JAVA_JAVA_SRCDIR) && \ + $(ZIP) -qur $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/src.zip org ) +endif + touch stamps/add-pulseaudio-debug.stamp + +# Note: for simplicity, we don't revert the update of src.zip +clean-add-pulseaudio-debug: + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/$(INSTALL_ARCH_DIR)/libpulse-java.so + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/ext/pulse-java.jar + rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2re-image/lib/ext/pulse-java.jar + rm -f stamps/add-pulseaudio-debug.stamp + # OpenJDK ecj Targets # ===================