[icedtea-web] [patch] use LDFLAGS, and allow overwriting some cpp macros

[Matthias Klose]

I'd like to see this on trunk and on the branches.

 - the link step should honour LDFLAGS, when passed
   LDFLAGS is passed to configure.

 - moving around VERSION_DEFS is a no-op for most
   cases, but allows overwriting some of the cpp defines.
   I'm using this to build the plugin for 6 and 7 with
   just one jdk installed.

Matthias

-------------- next part --------------
diff -r 956ca57557a0 ChangeLog
--- a/ChangeLog	Wed Sep 05 17:54:22 2012 -0400
+++ b/ChangeLog	Thu Sep 06 15:48:22 2012 +0200
@@ -1,3 +1,9 @@
+2012-09-06  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am ($(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): Use LDFLAGS.
+	$(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc: Move VERSION_DEFS behind
+	macro definitions.
+
 2012-09-05  Jiri Vanek  <jvanek at redhat.com>
 
 	Fixing several errors which were causing incorrect behaviour causing
diff -r 956ca57557a0 Makefile.am
--- a/Makefile.am	Wed Sep 05 17:54:22 2012 -0400
+++ b/Makefile.am	Thu Sep 06 15:48:22 2012 +0200
@@ -259,7 +259,7 @@
 	mkdir -p $(PLUGIN_DIR) && \
 	cd $(PLUGIN_DIR) && \
 	$(CXX) $(CXXFLAGS) \
-	   $(DEFS) $(VERSION_DEFS) \
+	  $(DEFS) \
 	  -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \
 	  -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \
 	  -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \
@@ -267,6 +267,7 @@
 	  -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \
 	  -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \
 	  -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \
+	  $(VERSION_DEFS) \
 	  $(GLIB_CFLAGS) \
 	  $(GTK_CFLAGS) \
 	  $(MOZILLA_CFLAGS) \
@@ -274,7 +275,7 @@
 
 $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY): $(addprefix $(PLUGIN_DIR)/,$(PLUGIN_OBJECTS))
 	cd $(PLUGIN_DIR) && \
-	$(CXX) $(CXXFLAGS) \
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) \
 	  $(PLUGIN_OBJECTS) \
 	  $(GLIB_LIBS) \
 	  $(GTK_LIBS) \