Mercurial > hg > release > icedtea6-1.6

changeset 1687:ef5ed16daa87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reference rather than copy the netscape.* plugin sources. 2009-09-11 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Reference netscape.* plugin sources by path rather than copying them to rt. This avoids them getting packaged in tarballs.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 11 Sep 2009 17:09:38 +0100
parents 76a4bf70b153
children d36f851f90be
files ChangeLog Makefile.am
diffstat 2 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Sep 10 15:46:50 2009 +0100
+++ b/ChangeLog	Fri Sep 11 17:09:38 2009 +0100
@@ -1,3 +1,10 @@
+2009-09-11  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Reference netscape.* plugin sources by path rather than
+	copying them to rt.  This avoids them getting packaged
+	in tarballs.
+	
 2009-09-10  Andrew John Hughes  <ahughes@redhat.com>
 
 	* INSTALL: Update documentation to reflect recent changes and add
--- a/Makefile.am	Thu Sep 10 15:46:50 2009 +0100
+++ b/Makefile.am	Fri Sep 11 17:09:38 2009 +0100
@@ -14,6 +14,7 @@
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
+LIVECONNECT_SRCS = $(NPPLUGIN_DIR)/java
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
@@ -21,12 +22,14 @@
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR = 
+LIVECONNECT_SRCS = $(abs_top_srcdir)/plugin/icedtea
 else
 ICEDTEAPLUGIN_CLEAN =
 ICEDTEAPLUGIN_TARGET =
 PLUGIN_PATCH = 
 LIVECONNECT_DIR =
 NPPLUGIN_DIR =
+LIVECONNECT_SRCS =
 endif
 endif
 
@@ -823,13 +826,9 @@
 
 if ENABLE_NPPLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedteanp/java/netscape rt/
 else
 if ENABLE_PLUGIN
 	cp -a $(abs_top_srcdir)/plugin/icedtea/sun/applet/*java openjdk/jdk/src/share/classes/sun/applet/
-	mkdir -p rt
-	cp -a $(abs_top_srcdir)/plugin/icedtea/netscape rt/
 endif
 endif
 
@@ -1486,7 +1485,7 @@
 	find hotspot-tools -name '*.java' | sort > $@
 	mkdir -p lib/hotspot-tools
 
-ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt
+ABS_SOURCE_DIRS = $(abs_top_builddir)/generated:$(abs_top_builddir)/rt:$(abs_top_srcdir)/rt:$(LIVECONNECT_SRCS)
 stamps/hotspot-tools-class-files.stamp: hotspot-tools-source-files.txt
 	if ! test -d $(ICEDTEA_BOOT_DIR) ; \
 	then \
@@ -1535,7 +1534,7 @@
 
 # rt-closed.jar class files.
 rt-source-files.txt: stamps/replace-hotspot.stamp stamps/copy-source-files.stamp
-	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt -name '*.java' \
+	find $(abs_top_srcdir)/rt $(abs_top_builddir)/rt $(LIVECONNECT_SRCS) -name '*.java' \
 	  | sort -u > $@
 
 stamps/rt-class-files.stamp: rt-source-files.txt