/hg/icedtea-web: Remove pluginappletviewer binary

[omajid at icedtea.classpath.org]

changeset bee43070e71d in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=bee43070e71d
author: Omair Majid <omajid at redhat.com>
date: Fri Feb 18 11:55:23 2011 -0500

	Remove pluginappletviewer binary

	This changeset removes the unused pluginappletviewer binary from
	icedtea-web. IcedTeaPlugin.so invokes java directly.

	2011-02-18 Omair Majid <omajid at redhat.com>

	 Remove pluginappletviewer binary
	    * Makefile.am (ICEDTEAPLUGIN_TARGET): Remove dependency on
	pluginappletviewer. (PLUGIN_LAUNCHER_OBJECTS): Remove.
	(install-exec-local): Do not install pluginappletviewer.
	(uninstall-local): Do not remove pluginappletviewer.
	($(PLUGIN_DIR)/launcher/%.o): Remove.
	($(PLUGIN_DIR)/launcher/pluginappletviewer): Remove. (clean-
	IcedTeaPlugin): Dont clean plugin launcher files.


diffstat:

2 files changed, 13 insertions(+), 17 deletions(-)
ChangeLog   |   12 ++++++++++++
Makefile.am |   18 +-----------------

diffs (76 lines):

diff -r 2289777074ae -r bee43070e71d ChangeLog
--- a/ChangeLog	Tue Feb 15 17:03:09 2011 -0500
+++ b/ChangeLog	Fri Feb 18 11:55:23 2011 -0500
@@ -1,3 +1,15 @@ 2011-02-15  Omair Majid  <omajid at redhat.
+2011-02-18  Omair Majid  <omajid at redhat.com>
+
+	Remove pluginappletviewer binary
+	* Makefile.am
+	(ICEDTEAPLUGIN_TARGET): Remove dependency on pluginappletviewer.
+	(PLUGIN_LAUNCHER_OBJECTS): Remove.
+	(install-exec-local): Do not install pluginappletviewer.
+	(uninstall-local): Do not remove pluginappletviewer.
+	($(PLUGIN_DIR)/launcher/%.o): Remove.
+	($(PLUGIN_DIR)/launcher/pluginappletviewer): Remove.
+	(clean-IcedTeaPlugin): Dont clean plugin launcher files.
+
 2011-02-15  Omair Majid  <omajid at redhat.com>
 
 	* netx/net/sourceforge/jnlp/util/TimedHashMap.java: Do not extend HashMap
diff -r 2289777074ae -r bee43070e71d Makefile.am
--- a/Makefile.am	Tue Feb 15 17:03:09 2011 -0500
+++ b/Makefile.am	Fri Feb 18 11:55:23 2011 -0500
@@ -39,8 +39,7 @@ PLUGIN_DIR=$(abs_top_builddir)/plugin/ic
 PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
 PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
 LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
-ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so stamps/liveconnect-dist.stamp \
- $(PLUGIN_DIR)/launcher/pluginappletviewer
+ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/IcedTeaPlugin.so stamps/liveconnect-dist.stamp
 PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
 endif
 
@@ -66,7 +65,6 @@ endif
 
 LAUNCHER_SRCDIR = $(abs_top_srcdir)/launcher
 LAUNCHER_OBJECTS = java.o java_md.o splashscreen_stubs.o jli_util.o parse_manifest.o version_comp.o wildcard.o
-PLUGIN_LAUNCHER_OBJECTS = $(addprefix $(PLUGIN_DIR)/launcher/,$(LAUNCHER_OBJECTS))
 NETX_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/,$(LAUNCHER_OBJECTS))
 CONTROLPANEL_LAUNCHER_OBJECTS = $(addprefix $(NETX_DIR)/launcher/controlpanel/,$(LAUNCHER_OBJECTS))
 LAUNCHER_FLAGS = -O2 -fno-strict-aliasing -fPIC -pthread -W -Wall -Wno-unused -Wno-parentheses -pipe -fno-omit-frame-pointer \
@@ -99,7 +97,6 @@ install-exec-local:
 	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)
 if ENABLE_PLUGIN
 	${INSTALL_PROGRAM} $(PLUGIN_DIR)/IcedTeaPlugin.so $(DESTDIR)$(prefix)/jre/lib/$(INSTALL_ARCH_DIR)/
-	${INSTALL_PROGRAM} $(PLUGIN_DIR)/launcher/pluginappletviewer $(DESTDIR)$(bindir)
 	${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/plugin.jar
 endif
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(prefix)/jre/lib/netx.jar
@@ -150,7 +147,6 @@ uninstall-local:
 	rm -f $(DESTDIR)$(prefix)/jre/lib/about.jnlp
 	rm -f $(DESTDIR)$(prefix)/jre/lib/about.jar
 	rm -f $(DESTDIR)$(prefix)/man/man1/javaws.1
-	rm -f $(DESTDIR)$(bindir)/pluginappletviewer
 	rm -f $(DESTDIR)$(bindir)/javaws
 	if [ -L $(DESTDIR)$(prefix)/jre/bin/javaws ] ; then \
 	  rm -f $(DESTDIR)$(prefix)/jre/bin/javaws ; \
@@ -201,19 +197,7 @@ PLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedTea
 	  $(MOZILLA_LIBS)\
 	  -shared -o $@
 
-$(PLUGIN_DIR)/launcher/%.o: $(LAUNCHER_SRCDIR)/%.c
-	mkdir -p $(PLUGIN_DIR)/launcher && \
-	$(CC) $(LAUNCHER_FLAGS) -DJAVA_ARGS='{ "sun.applet.PluginMain" }' -DPROGNAME='"pluginappletviewer"'  -c -o $@ $<
-
-$(PLUGIN_DIR)/launcher/pluginappletviewer: $(PLUGIN_LAUNCHER_OBJECTS)
-	$(CC) $(PLUGIN_LAUNCHER_OBJECTS) $(LAUNCHER_LINK)
-
 clean-IcedTeaPlugin:
-	rm -f $(PLUGIN_DIR)/launcher/*.o
-	rm -f $(PLUGIN_DIR)/launcher/pluginappletviewer
-	if [ -e $(PLUGIN_DIR)/launcher ]; then \
-		rmdir $(PLUGIN_DIR)/launcher ; \
-	fi
 	rm -f $(PLUGIN_DIR)/*.o
 	rm -f $(PLUGIN_DIR)/IcedTeaPlugin.so
 	if [ $(abs_top_srcdir) != $(abs_top_builddir) ]; then \