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.
This commit is contained in:
parent
8d9c8ece91
commit
76bd82023f
6 changed files with 25 additions and 11 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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@
|
||||
|
|
Loading…
Add table
Reference in a new issue