Mercurial > hg > release > icedtea6-1.8

changeset 1867:be247265a24d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add general stamps/plugin.stamp and clean-plugin targets for the plugin. 2010-01-27 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Use one general stamps/plugin.stamp to mark plugin installation as in IcedTea7. Add matching clean-plugin target.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 29 Jan 2010 01:24:21 +0000
parents bb0e039df90a
children a4c9d01462e1
files ChangeLog Makefile.am
diffstat 2 files changed, 18 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jan 27 17:52:01 2010 +0000
+++ b/ChangeLog	Fri Jan 29 01:24:21 2010 +0000
@@ -1,3 +1,10 @@
+2010-01-27 Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Use one general
+	stamps/plugin.stamp to mark plugin
+	installation as in IcedTea7.  Add
+	matching clean-plugin target.
+
 2010-01-27 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Reference plugin
--- a/Makefile.am	Wed Jan 27 17:52:01 2010 +0000
+++ b/Makefile.am	Fri Jan 29 01:24:21 2010 +0000
@@ -112,8 +112,8 @@
 # FIXME (plugin): LIVECONNECT_DIR becomes sun/applet netscape
 # FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
 if ENABLE_NPPLUGIN
-ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin.stamp
+ICEDTEANPPLUGIN_CLEAN = clean-IcedTeaNPPlugin
+ICEDTEANPPLUGIN_TARGET = $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
 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 = stamps/icedtea-plugin.stamp
+ICEDTEAPLUGIN_TARGET = IcedTeaPlugin.so
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR = 
@@ -1518,10 +1518,6 @@
 	  $(MOZILLA_LIBS)\
 	  -shared -o $@
 
-stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
-	mkdir -p stamps
-	touch stamps/icedtea-npplugin.stamp
-
 clean-IcedTeaNPPlugin:
 	cd $(NPPLUGIN_DIR);\
 	rm -f *.o; \
@@ -1547,18 +1543,19 @@
 	  $(MOZILLA_LIBS) \
 	  -shared -o $@
 
-stamps/icedtea-plugin.stamp: IcedTeaPlugin.so
-	mkdir -p stamps
-	touch stamps/icedtea-plugin.stamp
-
 clean-IcedTeaPlugin:
 	rm -f IcedTeaPlugin.o
 	rm -f IcedTeaPlugin.so
 endif
 endif
 
-#FIXME (plugin): Missing plugin.stamp
-#FIXME (clean): Missing clean-plugin
+stamps/plugin.stamp: $(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET)
+	mkdir -p stamps
+	touch stamps/icedtea-plugin.stamp
+
+clean-plugin: $(ICEDTEAPLUGIN_CLEAN) $(ICEDTEANPPLUGIN_CLEAN)
+	rm -f stamps/plugin.stamp
+
 #FIXME (plugin): Missing liveconnect-source-files.txt
 #FIXME (plugin): Missing liveconnect.stamp
 #FIXME (plugin): Missing liveconnect-dist.stamp
@@ -2259,6 +2256,6 @@
 
 jtreg: stamps/jtreg.stamp
 
-plugin: $(ICEDTEAPLUGIN_TARGET)
+plugin: stamps/plugin.stamp
 
 plugin-tests: stamps/plugin-tests.stamp