Mercurial > hg > release > icedtea6-1.8

changeset 1849:51f89f2b360e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build source files of NPPlugin separately. 2010-01-25 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Build NPPlugin source files separately.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 25 Jan 2010 23:05:52 +0000
parents dc097bf9130b
children a82258f09fae
files ChangeLog Makefile.am
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 25 23:03:23 2010 +0000
+++ b/ChangeLog	Mon Jan 25 23:05:52 2010 +0000
@@ -1,3 +1,8 @@
+2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am:
+	Build NPPlugin source files separately.
+	
 2010-01-25 Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Mon Jan 25 23:03:23 2010 +0000
+++ b/Makefile.am	Mon Jan 25 23:05:52 2010 +0000
@@ -1493,7 +1493,7 @@
         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) \
@@ -1502,7 +1502,7 @@
 	  $(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) && \