/hg/release/icedtea6-1.7: Proper dependency checking for files i...

[doko at icedtea.classpath.org]

changeset 856c59d59185 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=856c59d59185
author: doko at ubuntu.com
date: Fri Jan 15 01:29:21 2010 +0100

	Proper dependency checking for files involved in the build of the
	NPPlugin

	2010-01-14 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (stamps/icedtea-npplugin): New target, add
	file dependencies for building the IcedTeaNPPlugin.so.


diffstat:

2 files changed, 11 insertions(+), 3 deletions(-)
ChangeLog   |    5 +++++
Makefile.am |    9 ++++++---

diffs (52 lines):

diff -r eaf5d54cc7d1 -r 856c59d59185 ChangeLog
--- a/ChangeLog	Wed Jan 13 19:36:54 2010 -0500
+++ b/ChangeLog	Fri Jan 15 01:29:21 2010 +0100
@@ -1,3 +1,8 @@ 2010-01-13  Deepak Bhole <dbhole at redhat.
+2010-01-14  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/icedtea-npplugin): New target, add file
+	dependencies for building the IcedTeaNPPlugin.so.
+
 2010-01-13  Deepak Bhole <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
diff -r eaf5d54cc7d1 -r 856c59d59185 Makefile.am
--- a/Makefile.am	Wed Jan 13 19:36:54 2010 -0500
+++ b/Makefile.am	Fri Jan 15 01:29:21 2010 +0100
@@ -113,7 +113,7 @@ endif
 # FIXME (plugin): NPPLUGIN_DIR becomes PLUGIN_DIR
 if ENABLE_NPPLUGIN
 ICEDTEAPLUGIN_CLEAN = clean-IcedTeaNPPlugin
-ICEDTEAPLUGIN_TARGET = IcedTeaNPPlugin.so
+ICEDTEAPLUGIN_TARGET = stamps/icedtea-npplugin
 PLUGIN_PATCH = patches/icedtea-liveconnect.patch
 LIVECONNECT_DIR = -C lib/rt netscape
 NPPLUGIN_DIR=$(abs_top_srcdir)/plugin/icedteanp
@@ -1458,7 +1458,7 @@ NPPLUGIN_OBJECTS=IcedTeaNPPlugin.o IcedT
         IcedTeaJavaRequestProcessor.o IcedTeaPluginRequestProcessor.o \
 		IcedTeaPluginUtils.o
 
-IcedTeaNPPlugin_objects:
+$(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS)): $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_SRC))
 	cd $(NPPLUGIN_DIR); \
 	if [ -e $(abs_top_srcdir)/.hg ] && which $(HG) >/dev/null; then \
 	  revision="-r`(cd $(abs_top_srcdir); $(HG) tip --template '{rev}')`" ; \
@@ -1475,7 +1475,7 @@ IcedTeaNPPlugin_objects:
 	  -fPIC -c $(NPPLUGIN_SRC); \
 	cd ../
 
-IcedTeaNPPlugin.so: IcedTeaNPPlugin_objects
+$(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS))
 	cd $(NPPLUGIN_DIR); \
 	$(CXX) $(CXXFLAGS) \
 	  $(NPPLUGIN_OBJECTS) \
@@ -1484,6 +1484,9 @@ IcedTeaNPPlugin.so: IcedTeaNPPlugin_obje
 	  $(MOZILLA_LIBS)\
 	  -shared -o $@; \
 	cd ../
+
+stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
+	touch stamps/icedtea-npplugin
 
 clean-IcedTeaNPPlugin:
 	cd $(NPPLUGIN_DIR);\