From 76bd82023f5cc53d6ca40f33d87a10c26e5e9821 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Sun, 11 Apr 2010 13:17:24 -0700 Subject: [PATCH] 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. --- lib-src/ChangeLog | 6 ++++++ lib-src/Makefile.in | 16 +++++----------- lwlib/ChangeLog | 5 +++++ lwlib/Makefile.in | 2 ++ oldXMenu/ChangeLog | 5 +++++ oldXMenu/Makefile.in | 2 ++ 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index f618a1e6fab..857d3600f1a 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2010-04-11 Dan Nicolaescu + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE): Define using + autoconf, not cpp. + (ALL_CFLAGS): Use them as make variables. + 2010-04-07 Christoph (tiny change) * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 1e3d6868073..43f934a9ccd 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -34,6 +34,8 @@ CFLAGS=@CFLAGS@ 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 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) $(COM_ERRL #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 @@ LOADLIBES=LIBS_SYSTEM LIBS_MACHINE /* 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 diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index f0f9c34519e..a0a08827e9c 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2010-04-11 Dan Nicolaescu + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) + (C_SWITCH_X_SITE): Define using autoconf. + 2010-04-11 Jan Djärv * lwlib-Xaw.c (widget_xft_data): New for Xft data. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 5645481d158..c79292ea59c 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -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@ diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index e39f931e6e4..1dd1e1bdd9a 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,8 @@ +2010-04-11 Dan Nicolaescu + + * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) + (C_SWITCH_X_SITE): Define using autoconf. + 2010-03-10 Chong Yidong * Branch for 23.2. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index a4a2d52b156..2e253ab5714 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -46,6 +46,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@ EXTRA=insque.o CC=@CC@ -- 2.39.5