changeset in /hg/icedtea: Deepak's Makefile.am updates.

[Andrew John Hughes]

changeset 96a276fcaa9e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=96a276fcaa9e
description:
	Deepak's Makefile.am updates.

	2009-07-10  Deepak Bhole  <dbhole at redhat.com>

		* Makefile.am: Update makefile to pick up plugin C++ files from new
		location.

diffstat:

1 file changed, 21 insertions(+), 4 deletions(-)
Makefile.am |   25 +++++++++++++++++++++----

diffs (50 lines):

diff -r 5da2e8e775d5 -r 96a276fcaa9e Makefile.am
--- a/Makefile.am	Fri Jul 10 19:02:10 2009 -0400
+++ b/Makefile.am	Tue Aug 04 14:35:37 2009 +0100
@@ -3219,6 +3219,17 @@ if ENABLE_NPPLUGIN
 # is listed before -l options.  See:
 # http://developer.mozilla.org/en/docs/XPCOM_Glue
 IcedTeaNPPlugin.o: IcedTeaNPPlugin.cc
+
+NPPLUGIN_SRC=IcedTeaNPPlugin.cc IcedTeaScriptablePluginObject.cc \
+	IcedTeaJavaRequestProcessor.cc IcedTeaPluginRequestProcessor.cc \
+	IcedTeaPluginUtils.cc
+
+NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedTeaScriptablePluginObject.o \
+	IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
+	IcedTeaPluginUtils.o
+
+IcedTeaNPPlugin_objects:
+	(cd plugin/icedteanp 
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
 	fi ; \
@@ -3231,18 +3242,24 @@ IcedTeaNPPlugin.o: IcedTeaNPPlugin.cc
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
-	  -fPIC -c -o $@ $<
-IcedTeaNPPlugin.so: IcedTeaNPPlugin.o
+	  -fPIC -c $(NPPLUGIN_SRC)
+	  )
+
+IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
+	(cd plugin/icedteanp 
 	$(CXX) $(CXXFLAGS) \
-	  $< \
+	  $(NPPLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
 	  $(GTK_LIBS) \
 	  $(MOZILLA_LIBS)\
 	  -shared -o $@
+	)
 
 clean-IcedTeaNPPlugin:
-	rm -f IcedTeaNPPlugin.o
+	(cd plugin/icedteanp
+	rm -f $(NPPLUGIN_OBJECTS)
 	rm -f IcedTeaNPPlugin.so
+	)
 endif
 if ENABLE_PLUGIN
 # IcedTeaPlugin.so.