Mercurial > hg > release > icedtea-web-1.1

changeset 276:88e6e058cdf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added DEFS to icedtea plugin compilation
author Jiri Vanek <jvanek@redhat.com>
date Wed, 21 Dec 2011 12:33:06 +0100
parents fe8436ed6d95
children cdd0bbf399e8
files ChangeLog Makefile.am
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Dec 21 10:34:41 2011 +0100
+++ b/ChangeLog	Wed Dec 21 12:33:06 2011 +0100
@@ -1,3 +1,10 @@
+2011-12-21  Jiri Vanek  <jvanek@redhat.com>
+
+	*Makefile.am:
+	($(PLUGIN_DIR)/%.o): added $(DEFS), as it was added to head long ago,
+	 but never backported to this branch. Previous patch is not working
+	 correctly without DEFS.
+
 2011-12-21  Jiri Vanek  <jvanek@redhat.com>
 
 	* acinclude.m4: added definition of IT_CHECK_XULRUNNER_API_VERSION,
--- a/Makefile.am	Wed Dec 21 10:34:41 2011 +0100
+++ b/Makefile.am	Wed Dec 21 12:33:06 2011 +0100
@@ -202,6 +202,7 @@
 	mkdir -p $(PLUGIN_DIR) && \
 	cd $(PLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
+	   $(DEFS) \
 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \