Pass CFLAGS to the linker.

* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.

* lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed.

* msdos/sed1v2.inp (PROFILING_LDFLAGS):
* msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.

* src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
(PROFILING_LDFLAGS): Remove, not needed anymore.

10 files changed, 21 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index a215c071be5..b859353b083 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: No more doc/emacs/*.texi.in.
diff --git a/configure b/configure
index 144d6dff5c3..2db41ecf485 100755
--- a/configure
+++ b/configure
@@ -749,7 +749,6 @@ build_os
 build_vendor
 build_cpu
 build
-PROFILING_LDFLAGS
 PROFILING_CFLAGS
 MAINT
 GZIP_INFO
@@ -3038,14 +3037,11 @@ fi
 
 if test x$ac_enable_profiling != x ; then
    PROFILING_CFLAGS="-DPROFILING=1 -pg"
-   PROFILING_LDFLAGS="-pg"
 else
    PROFILING_CFLAGS=
-   PROFILING_LDFLAGS=
 fi
 
 
-
 # Check whether --enable-autodepend was given.
 if test "${enable_autodepend+set}" = set; then :
   enableval=$enable_autodepend; ac_enable_autodepend="${enableval}"
@@ -7679,7 +7675,7 @@ tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
-TEMACS_LDFLAGS2="\${LDFLAGS} \${PROFILING_LDFLAGS}"
+TEMACS_LDFLAGS2="\${LDFLAGS}"
 if test "${with_ns}" != no; then
   if test "${opsys}" = darwin; then
      NS_IMPL_COCOA=yes
diff --git a/configure.in b/configure.in
index 51d70121280..506732413ae 100644
--- a/configure.in
+++ b/configure.in
@@ -325,13 +325,10 @@ AC_ARG_ENABLE(profiling,
 [ac_enable_profiling="${enableval}"],[])
 if test x$ac_enable_profiling != x ; then
    PROFILING_CFLAGS="-DPROFILING=1 -pg"
-   PROFILING_LDFLAGS="-pg"
 else
    PROFILING_CFLAGS=
-   PROFILING_LDFLAGS=
 fi
 AC_SUBST(PROFILING_CFLAGS)
-AC_SUBST(PROFILING_LDFLAGS)
 
 AC_ARG_ENABLE(autodepend,
 [AS_HELP_STRING([--enable-autodepend],
@@ -1487,7 +1484,7 @@ tmp_CPPFLAGS="$CPPFLAGS"
 tmp_CFLAGS="$CFLAGS"
 CPPFLAGS="$CPPFLAGS -x objective-c"
 CFLAGS="$CFLAGS -x objective-c"
-TEMACS_LDFLAGS2="\${LDFLAGS} \${PROFILING_LDFLAGS}"
+TEMACS_LDFLAGS2="\${LDFLAGS}"
 dnl I don't think it's especially important, but src/Makefile.in
 dnl (now the only user of ns_appdir) used to go to the trouble of adding a
 dnl trailing "/" to it, so now we do it here.
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 10c93238edd..0f24b234972 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * Makefile.in (PROFILING_LDFLAGS): Remove, not needed.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * b2m.c, b2m.pl: Remove files.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index fda0ccaf3ed..b90b19b69b6 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -39,7 +39,6 @@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
 C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
-PROFILING_LDFLAGS = @PROFILING_LDFLAGS@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -173,7 +172,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) ${C_WARNINGS_SWITCH} \
               -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src
 
 ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = ${BASE_CFLAGS} ${PROFILING_LDFLAGS} ${LDFLAGS} ${CFLAGS}
+LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS}
 CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS}
 
 LOADLIBES=$(LIBS_SYSTEM)
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 6c3f0132811..e0b3a965402 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * sed1v2.inp (PROFILING_LDFLAGS):
+        * sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
         * mainmake.v2 (install): Remove b2m.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 0ea34ecffc6..3c1770d1ba1 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -43,7 +43,6 @@ s/\.h\.in/.h-in/
 /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
 #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@//
 /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@//
 /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@//
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 9e2e3ebd23f..4a19d36a581 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -41,7 +41,6 @@
 /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@//
 /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@//
 /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@//
-/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@//
 /^LOADLIBES *=/s!=.*$!=!
 /^ALLOCA *=/s!@ALLOCA@!!
 /^EXEEXT *=/s!@EXEEXT@!!
diff --git a/src/ChangeLog b/src/ChangeLog
index 181c6c55c10..2e0aeef2971 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
+        (PROFILING_LDFLAGS): Remove, not needed anymore.
+
         * Makefile.in: Use $(...) everywhere instead of ${...}
         (CRT_DIR): Move near potential user.
         (START_FILE): Move near CRT_DIR, it might use it.
diff --git a/src/Makefile.in b/src/Makefile.in
index 8fd163bb185..76fc1e74f38 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -65,7 +65,6 @@ OTHER_FILES = @OTHER_FILES@
 
 ## Flags to pass for profiling builds
 PROFILING_CFLAGS = @PROFILING_CFLAGS@
-PROFILING_LDFLAGS = @PROFILING_LDFLAGS@
 
 ## Flags to pass to the compiler to enable build warnings
 C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
@@ -114,7 +113,7 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@
 ## Flags to pass to ld only for temacs.
 TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
 
-## $LDFLAGS $PROFILING_LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason).
+## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason).
 TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
 
 ## Some systems define this to request special libraries.
@@ -648,7 +647,7 @@ buildobj.h: Makefile
 
 
 temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj)
-        $(CC) $(LD_FIRSTFLAG) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \
+        $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \
           -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES)
 
 ## The following oldxmenu-related rules are only (possibly) used if