Mercurial > hg > release > icedtea6-1.8
changeset 1846:ae4a9516faec
Provide a plugin alias depending on the appropriate plugin stamp.
2010-01-25 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
Provide stamp targets for both npplugin
and the old plugin so 'make plugin' builds
the one configured.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Mon, 25 Jan 2010 21:59:04 +0000 |
| parents | 73f992e2b417 |
| children | 8de40d0c722a |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 22 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Jan 25 21:52:19 2010 +0000 +++ b/ChangeLog Mon Jan 25 21:59:04 2010 +0000 @@ -1,3 +1,10 @@ +2010-01-25 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + Provide stamp targets for both npplugin + and the old plugin so 'make plugin' builds + the one configured. + 2010-01-25 Andrew John Hughes <ahughes@redhat.com> * Makefile.am:
--- a/Makefile.am Mon Jan 25 21:52:19 2010 +0000 +++ b/Makefile.am Mon Jan 25 21:59:04 2010 +0000 @@ -1513,8 +1513,9 @@ $(MOZILLA_LIBS)\ -shared -o $@ -stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so - touch stamps/icedtea-npplugin +stamps/icedtea-npplugin.stamp: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so + mkdir -p stamps + touch stamps/icedtea-npplugin.stamp clean-IcedTeaNPPlugin: cd $(NPPLUGIN_DIR);\ @@ -1541,6 +1542,10 @@ $(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 @@ -2221,3 +2226,11 @@ clean: distclean-local jtreg: stamps/jtreg.stamp + +if ENABLE_NPPLUGIN +plugin: stamps/icedtea-npplugin.stamp +else +if ENABLE_PLUGIN +plugin: stamps/icedtea-plugin.stamp +endif +endif