/hg/release/icedtea6-1.7: 3 new changesets

[andrew at icedtea.classpath.org]

changeset 418e2d193a98 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=418e2d193a98
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 23:05:52 2010 +0000

	Build source files of NPPlugin separately.

	2010-01-25 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Build NPPlugin source files
	separately.


changeset 3cb8dabb257e in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=3cb8dabb257e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 22:45:06 2010 +0000

	Obtain Java plugin sources from NPPLUGIN_SRCDIR not NPPLUGIN_DIR.

	2010-01-25 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Use NPPLUGIN_SRCDIR for Java plugin
	sources.


changeset 7ca090cc0c9b in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=7ca090cc0c9b
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon Jan 25 23:03:23 2010 +0000

	Fix ICEDTEAPLUGIN_TARGET and remove redundant
	ICEDTEANPPLUGIN_TARGET.

	2010-01-25 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: Fix ICEDTEAPLUGIN_TARGET to use new
	stamp targets and remove redundant ICEDTEANPPPLUGIN_TARGET.


diffstat:

2 files changed, 25 insertions(+), 14 deletions(-)
ChangeLog   |   17 +++++++++++++++++
Makefile.am |   22 ++++++++--------------

diffs (95 lines):

diff -r 5ac24157f4ba -r 7ca090cc0c9b ChangeLog
--- a/ChangeLog	Mon Jan 25 21:59:04 2010 +0000
+++ b/ChangeLog	Mon Jan 25 23:03:23 2010 +0000
@@ -1,3 +1,20 @@ 2010-01-25 Andrew John Hughes  <ahughes@
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Fix ICEDTEAPLUGIN_TARGET to use new
+	stamp targets and remove redundant
+	ICEDTEANPPPLUGIN_TARGET.
+	
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Use NPPLUGIN_SRCDIR for Java plugin sources.
+	
+2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Build NPPlugin source files separately.
+	
 2010-01-25 Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 5ac24157f4ba -r 7ca090cc0c9b Makefile.am
--- a/Makefile.am	Mon Jan 25 21:59:04 2010 +0000
+++ b/Makefile.am	Mon Jan 25 23:03:23 2010 +0000
@@ -113,16 +113,16 @@ endif
 # 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
 NPPLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
-LIVECONNECT_SRCS = $(NPPLUGIN_DIR)/java
+LIVECONNECT_SRCS = $(NPPLUGIN_SRCDIR)/java
 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 = 
@@ -1209,7 +1209,7 @@ stamps/icedtea.stamp: stamps/bootstrap-d
 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) \
@@ -1308,7 +1308,7 @@ stamps/icedtea-debug.stamp: stamps/boots
 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) \
@@ -1490,7 +1490,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
         IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
 		IcedTeaPluginUtils.o
 
-$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC))
+$(NPPLUGIN_DIR)/%.o: $(NPPLUGIN_SRCDIR)/%.cc
 	mkdir -p $(NPPLUGIN_DIR) && \
 	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
@@ -1499,7 +1499,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
-	  -fPIC -c $(addprefix $(NPPLUGIN_SRCDIR)/,$(NPPLUGIN_SRC))
+	  -fPIC -o $@ -c $<
 
 $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS))
 	cd $(NPPLUGIN_DIR) && \
@@ -2224,10 +2224,4 @@ 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
+plugin: $(ICEDTEAPLUGIN_TARGET)