Mercurial > emacs
changeset 107830:3879f5eab4e9
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 11 Apr 2010 13:17:24 -0700 |
| parents | f008e626c316 |
| children | 92451fdcc718 |
| files | lib-src/ChangeLog lib-src/Makefile.in lwlib/ChangeLog lwlib/Makefile.in oldXMenu/ChangeLog oldXMenu/Makefile.in |
| diffstat | 6 files changed, 25 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lib-src/ChangeLog Sun Apr 11 13:04:24 2010 -0700 +++ b/lib-src/ChangeLog Sun Apr 11 13:17:24 2010 -0700 @@ -1,3 +1,9 @@ +2010-04-11 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using + autoconf, not cpp. + (ALL_CFLAGS): Use them as make variables. + 2010-04-07 Christoph <cschol2112@googlemail.com> (tiny change) * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
--- a/lib-src/Makefile.in Sun Apr 11 13:04:24 2010 -0700 +++ b/lib-src/Makefile.in Sun Apr 11 13:17:24 2010 -0700 @@ -34,6 +34,8 @@ version=@version@ configuration=@configuration@ EXEEXT=@EXEEXT@ +C_SWITCH_SYSTEM=@c_switch_system@ +C_SWITCH_MACHINE=@c_switch_machine@ # 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
--- a/lwlib/ChangeLog Sun Apr 11 13:04:24 2010 -0700 +++ b/lwlib/ChangeLog Sun Apr 11 13:17:24 2010 -0700 @@ -1,3 +1,8 @@ +2010-04-11 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) + (C_SWITCH_X_SITE): Define using autoconf. + 2010-04-11 Jan Djärv <jan.h.d@swipnet.se> * lwlib-Xaw.c (widget_xft_data): New for Xft data.
--- a/lwlib/Makefile.in Sun Apr 11 13:04:24 2010 -0700 +++ b/lwlib/Makefile.in Sun Apr 11 13:17:24 2010 -0700 @@ -26,6 +26,8 @@ srcdir=@srcdir@ VPATH=@srcdir@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ +C_SWITCH_SYSTEM=@c_switch_system@ +C_SWITCH_MACHINE=@c_switch_machine@ CC=@CC@ CFLAGS=@CFLAGS@
--- a/oldXMenu/ChangeLog Sun Apr 11 13:04:24 2010 -0700 +++ b/oldXMenu/ChangeLog Sun Apr 11 13:17:24 2010 -0700 @@ -1,3 +1,8 @@ +2010-04-11 Dan Nicolaescu <dann@ics.uci.edu> + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) + (C_SWITCH_X_SITE): Define using autoconf. + 2010-03-10 Chong Yidong <cyd@stupidchicken.com> * Branch for 23.2.