# HG changeset patch # User Jiri Vanek # Date 1324467186 -3600 # Node ID 88e6e058cdf3c8e36027b4d6a7ac328e31ae7979 # Parent fe8436ed6d95c795d06ef1132ae2cb6d2e93adf7 Added DEFS to icedtea plugin compilation diff -r fe8436ed6d95 -r 88e6e058cdf3 ChangeLog --- 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 + + *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 * acinclude.m4: added definition of IT_CHECK_XULRUNNER_API_VERSION, diff -r fe8436ed6d95 -r 88e6e058cdf3 Makefile.am --- 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)\"" \