Summary: minor, put XCCLDFLAGS in libtool built binaries and libs

Keywords: build icc

This changeset adds XCCLDFLAGS to all libs and binaries touched by
libtool, in general whenever there's a foo_la_bar foo_la_LDFLAGS or
AM_LDFLAGS should contain $(XCCLDFLAGS).

* modules/ase/Makefile.am: add XCCLDFLAGS

* modules/cl/Makefile.am: add XCCLDFLAGS

* modules/dbus/Makefile.am: add XCCLDFLAGS

* modules/ldap/Makefile.am: add XCCLDFLAGS

* src/Makefile.am: add XCCLDFLAGS

* src/ui/lwlib/Makefile.am: add XCCLDFLAGS

Signed-off-by: Sebastian Freundt <freundt@ga-group.nl>

diff --git a/modules/ase/Makefile.am b/modules/ase/Makefile.am
index efe979d..161483c 100644 (file)
--- a/modules/ase/Makefile.am
+++ b/modules/ase/Makefile.am
@@ -50,7 +50,7 @@ headerdir = $(includedir)/$(instvarsepdir)
 AM_CFLAGS = $(dll_cflags) -DIMA_MODULE -DUSE_SXEMACS_CONFIG_H
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
        -I$(top_builddir)/src $(SXEMACS_INCLUDES) $(c_switch_all)
-AM_LDFLAGS = -module
+AM_LDFLAGS = -module $(XCCLDFLAGS)
 
 ## all the mods
 module_LTLIBRARIES =

diff --git a/modules/cl/Makefile.am b/modules/cl/Makefile.am
index 767952e..947df24 100644 (file)
--- a/modules/cl/Makefile.am
+++ b/modules/cl/Makefile.am
@@ -50,7 +50,7 @@ headerdir = $(includedir)/$(instvarsepdir)
 AM_CFLAGS = $(dll_cflags) -DIMA_MODULE
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
        -I$(top_builddir)/src $(SXEMACS_INCLUDES) $(c_switch_all)
-AM_LDFLAGS = -module
+AM_LDFLAGS = -module $(XCCLDFLAGS)
 AM_YFLAGS = -d
 
 ## all the mods

diff --git a/modules/dbus/Makefile.am b/modules/dbus/Makefile.am
index 3b4d1a9..723b877 100644 (file)
--- a/modules/dbus/Makefile.am
+++ b/modules/dbus/Makefile.am
@@ -50,7 +50,7 @@ headerdir = $(includedir)/$(instvarsepdir)
 AM_CFLAGS = $(dll_cflags) -DIMA_MODULE -DUSE_SXEMACS_CONFIG_H
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir)  -I$(top_srcdir)/src \
        -I$(top_builddir)/src $(SXEMACS_INCLUDES) $(c_switch_all)
-AM_LDFLAGS = -module
+AM_LDFLAGS = -module $(XCCLDFLAGS)
 
 ## custom rules
 SXEMACS = $(top_builddir)/src/sxemacs

diff --git a/modules/ldap/Makefile.am b/modules/ldap/Makefile.am
index bbe77ed..9515554 100644 (file)
--- a/modules/ldap/Makefile.am
+++ b/modules/ldap/Makefile.am
@@ -19,7 +19,7 @@ eldap_ell_DEPENDENCIES = eldap_i.o eldap_i.c
 eldap_ell_CPPFLAGS = @SXEMACS_INCLUDES@
 eldap_ell_LINK = $(CCLD) --mod-output=$@
 eldap_ell_LDADD = eldap_i.o
-eldap_ell_LDFLAGS = @LDFLAGS@
+eldap_ell_LDFLAGS = @LDFLAGS@ $(XCCLDFLAGS)
 
 top_builddir = @top_builddir@
 top_build_prefix = $(top_builddir)/

diff --git a/src/Makefile.am b/src/Makefile.am
index 32dc335..5744a6f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,7 @@ abs_top_srcdir = @abs_top_srcdir@
 
 AM_CFLAGS = -Demacs $(OPENSSL_CFLAGS) -DUSE_SXEMACS_CONFIG_H -DXTSTRINGDEFINES
 AM_CPPFLAGS = -I$(srcdir) -I$(builddir) -I$(top_builddir) $(c_switch_system) $(LTDLINCL)
-AM_LDFLAGS = $(OPENSSL_LDFLAGS) $(ENT_LDFLAGS) $(LIBLTDL)
+AM_LDFLAGS = $(OPENSSL_LDFLAGS) $(ENT_LDFLAGS) $(LIBLTDL) $(XCCLDFLAGS)
 
 headerdir = $(includedir)/$(instvarsepdir)
 sheaderdir = $(headerdir)/s

diff --git a/src/ui/lwlib/Makefile.am b/src/ui/lwlib/Makefile.am
index 689144b..5729cda 100644 (file)
--- a/src/ui/lwlib/Makefile.am
+++ b/src/ui/lwlib/Makefile.am
@@ -59,7 +59,7 @@ libsxelw_Xt_la_DEPENDENCIES = $(lwlib_objs:.o=.lo)
 libsxelw_Xt_la_LIBADD = $(lwlib_objs:.o=.lo) \
        $(X_LIBS) $(ld_libs_window_system)
 libsxelw_Xt_la_CPPFLAGS = $(AM_CPPFLAGS)
-libsxelw_Xt_la_LDFLAGS = $(AM_LDFLAGS) $(lib_gcc)
+libsxelw_Xt_la_LDFLAGS = $(AM_LDFLAGS) $(lib_gcc) $(XCCLDFLAGS)
 if WITH_BDWGC
 libsxelw_Xt_la_CPPFLAGS += $(BDWGC_CPPFLAGS)
 libsxelw_Xt_la_LDFLAGS += $(BDWGC_LDFLAGS) $(BDWGC_LIBS)