Mercurial > hg > release > icedtea6-1.8

changeset 1848:dc097bf9130b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ICEDTEAPLUGIN_TARGET and remove redundant ICEDTEANPPLUGIN_TARGET. 2010-01-25 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Fix ICEDTEAPLUGIN_TARGET to use new stamp targets and remove redundant ICEDTEANPPPLUGIN_TARGET.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 25 Jan 2010 23:03:23 +0000
parents 8de40d0c722a
children 51f89f2b360e
files ChangeLog Makefile.am
diffstat 2 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 25 22:45:06 2010 +0000
+++ b/ChangeLog	Mon Jan 25 23:03:23 2010 +0000
@@ -1,3 +1,10 @@
+2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Fix ICEDTEAPLUGIN_TARGET to use new
+	stamp targets and remove redundant
+	ICEDTEANPPPLUGIN_TARGET.
+	
 2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Jan 25 22:45:06 2010 +0000
+++ b/Makefile.am	Mon Jan 25 23:03:23 2010 +0000
@@ -113,7 +113,7 @@
 # FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
 if ENABLE_NPPLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin
+ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin.stamp
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
@@ -122,7 +122,7 @@
 else
 if ENABLE_PLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
-ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
+ICEDTEAPLUGIN_TARGET = stamps/icedtea-plugin.stamp
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR = 
@@ -1212,7 +1212,7 @@
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
+	$(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
 	stamps/pulse-java.stamp
 	$(ARCH_PREFIX) $(MAKE) \
@@ -1311,7 +1311,7 @@
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
 	stamps/hotspot-tools.stamp stamps/plugs.stamp \
 	stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
-	$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) \
+	$(ICEDTEAPLUGIN_TARGET) \
 	extra-lib/about.jar stamps/cacao.stamp stamps/visualvm.stamp \
 	stamps/pulse-java.stamp
 	$(ARCH_PREFIX) $(MAKE) \
@@ -2227,10 +2227,4 @@
 
 jtreg: stamps/jtreg.stamp
 
-if ENABLE_NPPLUGIN
-plugin: stamps/icedtea-npplugin.stamp
-else
-if ENABLE_PLUGIN
-plugin: stamps/icedtea-plugin.stamp
-endif
-endif
+plugin: $(ICEDTEAPLUGIN_TARGET)