Mercurial > hg > release > icedtea6-1.8

changeset 1838:8aa81a796b0b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't hide errors in statement sequences building the NPPlugin 2010-01-21 Matthias Klose <doko@ubuntu.com> * Makefile.am: Don't hide errors in statement sequences building the NPPlugin. Use ICEDTEA_REV to defined PLUGIN_VERSION.
author doko@ubuntu.com
date Thu, 21 Jan 2010 16:20:47 +0100
parents 2d94f16209e8
children b227a81ef16c
files ChangeLog Makefile.am
diffstat 2 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Jan 21 02:23:36 2010 +0000
+++ b/ChangeLog	Thu Jan 21 16:20:47 2010 +0100
@@ -1,3 +1,8 @@
+2010-01-21  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am: Don't hide errors in statement sequences building
+	the NPPlugin. Use ICEDTEA_REV to defined PLUGIN_VERSION.
+
 2010-01-21  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Thu Jan 21 02:23:36 2010 +0000
+++ b/Makefile.am	Thu Jan 21 16:20:47 2010 +0100
@@ -1481,31 +1481,24 @@
 		IcedTeaPluginUtils.o
 
 $(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}')`" ; \
-	fi ; \
-	if [ -n "$(PKGVERSION)" ]; then plugin_version=" ($(PKGVERSION))"; fi; \
-	plugin_version=" $(PACKAGE_VERSION)$$revision$$plugin_version"; \
+	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
 	  -DPACKAGE_VERSION="\"$(PACKAGE_VERSION)\"" \
-	  -DPLUGIN_VERSION="\"$$plugin_version\"" \
+	  -DPLUGIN_VERSION="\"$(PACKAGE_VERSION)$(ICEDTEA_REV)\"" \
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
-	  -fPIC -c $(NPPLUGIN_SRC); \
-	cd ../
+	  -fPIC -c $(NPPLUGIN_SRC)
 
 $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so: $(addprefix $(NPPLUGIN_DIR)/,$(NPPLUGIN_OBJECTS))
-	cd $(NPPLUGIN_DIR); \
+	cd $(NPPLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
 	  $(NPPLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
 	  $(GTK_LIBS) \
 	  $(MOZILLA_LIBS)\
-	  -shared -o $@; \
-	cd ../
+	  -shared -o $@
 
 stamps/icedtea-npplugin: $(NPPLUGIN_DIR)/IcedTeaNPPlugin.so
 	touch stamps/icedtea-npplugin