[Emacs-diffs] /srv/bzr/emacs/trunk r99874: Use autoconf, not cpp for some variables.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99874
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sun 2010-04-11 13:17:24 -0700
message:
  Use autoconf, not cpp for some variables.
  * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
  (C_SWITCH_X_SITE): Define using autoconf.
  
  * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
  (C_SWITCH_X_SITE): Define using autoconf.
  
  * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
  autoconf, not cpp.
  (ALL_CFLAGS): Use them as make variables.
modified:
  lib-src/ChangeLog
  lib-src/Makefile.in
  lwlib/ChangeLog
  lwlib/Makefile.in
  oldXMenu/ChangeLog
  oldXMenu/Makefile.in

=== modified file 'lib-src/ChangeLog'
--- a/lib-src/ChangeLog 2010-04-07 13:43:04 +0000
+++ b/lib-src/ChangeLog 2010-04-11 20:17:24 +0000
@@ -1,3 +1,9 @@
+2010-04-11  Dan Nicolaescu  <address@hidden>
+
+       * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using
+       autoconf, not cpp.
+       (ALL_CFLAGS): Use them as make variables.
+
 2010-04-07  Christoph  <address@hidden>  (tiny change)
 
        * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis

=== modified file 'lib-src/Makefile.in'
--- a/lib-src/Makefile.in       2010-03-24 18:02:56 +0000
+++ b/lib-src/Makefile.in       2010-04-11 20:17:24 +0000
@@ -34,6 +34,8 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
 
 # Program name transformation.
 TRANSFORM = @program_transform_name@
@@ -168,14 +170,6 @@
 #define LIBS_MACHINE
 #endif
 
-#ifndef C_SWITCH_SYSTEM
-#define C_SWITCH_SYSTEM
-#endif
-
-#ifndef C_SWITCH_MACHINE
-#define C_SWITCH_MACHINE
-#endif
-
 #undef MOVEMAIL_NEEDS_BLESSING
 #ifndef MAIL_USE_FLOCK
 #ifndef MAIL_USE_LOCKF
@@ -194,11 +188,11 @@
 /* Those files shared with other GNU utilities need HAVE_CONFIG_H
    defined before they know they can take advantage of the information
    in ../src/config.h.  */
-ALL_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+ALL_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}
-LINK_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+LINK_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${LDFLAGS} ${CFLAGS}
-CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -DHAVE_CONFIG_H \
+CPP_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) -DHAVE_CONFIG_H \
    -I. -I../src -I${srcdir} -I${srcdir}/../src ${CPPFLAGS} ${CFLAGS}
 
 .SUFFIXES: .m

=== modified file 'lwlib/ChangeLog'
--- a/lwlib/ChangeLog   2010-04-11 18:25:09 +0000
+++ b/lwlib/ChangeLog   2010-04-11 20:17:24 +0000
@@ -1,3 +1,8 @@
+2010-04-11  Dan Nicolaescu  <address@hidden>
+
+       * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
+       (C_SWITCH_X_SITE): Define using autoconf.
+
 2010-04-11  Jan Djärv  <address@hidden>
 
        * lwlib-Xaw.c (widget_xft_data): New for Xft data.

=== modified file 'lwlib/Makefile.in'
--- a/lwlib/Makefile.in 2010-01-13 08:35:10 +0000
+++ b/lwlib/Makefile.in 2010-04-11 20:17:24 +0000
@@ -26,6 +26,8 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
 
 address@hidden@
 address@hidden@

=== modified file 'oldXMenu/ChangeLog'
--- a/oldXMenu/ChangeLog        2010-03-10 15:17:13 +0000
+++ b/oldXMenu/ChangeLog        2010-04-11 20:17:24 +0000
@@ -1,3 +1,8 @@
+2010-04-11  Dan Nicolaescu  <address@hidden>
+
+       * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
+       (C_SWITCH_X_SITE): Define using autoconf.
+
 2010-03-10  Chong Yidong  <address@hidden>
 
        * Branch for 23.2.

=== modified file 'oldXMenu/Makefile.in'
--- a/oldXMenu/Makefile.in      2010-01-13 08:35:10 +0000
+++ b/oldXMenu/Makefile.in      2010-04-11 20:17:24 +0000
@@ -46,6 +46,8 @@
 address@hidden@
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
 
 EXTRA=insque.o
 address@hidden@