Commit 8d9c8ece authored by Dan Nicolaescu's avatar Dan Nicolaescu

Use autoconf, not cpp for some variables.

* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf, not cpp.
(ALL_CFLAGS): Use them as make variables.
(really-lwlib, really-oldXMenu): Do not pass them.
parent 1ecb2d3f
2010-04-11 Dan Nicolaescu <dann@ics.uci.edu>
Use autoconf, not cpp for some variables.
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
(C_SWITCH_X_SITE): Define using autoconf, not cpp.
(ALL_CFLAGS): Use them as make variables.
(really-lwlib, really-oldXMenu): Do not pass them.
2010-04-11 Jan Djärv <jan.h.d@swipnet.se>
* xmenu.c (apply_systemfont_to_dialog): New.
......
......@@ -75,11 +75,14 @@ LIBGIF=@LIBGIF@
LIBXPM=@LIBXPM@
XFT_LIBS=@XFT_LIBS@
C_SWITCH_SYSTEM=@c_switch_system@
C_SWITCH_MACHINE=@c_switch_machine@
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
# ========================== start of cpp stuff =======================
/* From here on, comments must be done in C syntax. */
C_SWITCH_SYSTEM=
/* just to be sure the sh is used */
SHELL=/bin/sh
......@@ -180,16 +183,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
#define LD_SWITCH_MACHINE_TEMACS
#endif
/* Some m/MACHINE.h files define this to request special switches in cc. */
#ifndef C_SWITCH_MACHINE
#define C_SWITCH_MACHINE
#endif
/* Some s/SYSTEM.h files define this to request special switches in cc. */
#ifndef C_SWITCH_SYSTEM
#define C_SWITCH_SYSTEM
#endif
/* These macros are for switches specifically related to X Windows. */
#ifndef C_SWITCH_X_MACHINE
#define C_SWITCH_X_MACHINE
......@@ -199,10 +192,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
#define C_SWITCH_X_SYSTEM
#endif
#ifndef C_SWITCH_X_SITE
#define C_SWITCH_X_SITE
#endif
#ifndef LD_SWITCH_X_SITE
#define LD_SWITCH_X_SITE
#endif
......@@ -269,7 +258,7 @@ GCONF_LIBS = @GCONF_LIBS@
/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
since it may have -I options that should override those two. */
ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} C_SWITCH_MACHINE C_SWITCH_SYSTEM C_SWITCH_X_SITE C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) C_SWITCH_X_MACHINE C_SWITCH_X_SYSTEM C_SWITCH_SYSTEM_TEMACS ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${DBUS_CFLAGS} ${GCONF_CFLAGS} ${CFLAGS} @FREETYPE_CFLAGS@ @FONTCONFIG_CFLAGS@ @LIBOTF_CFLAGS@ @M17N_FLT_CFLAGS@ ${DEPFLAGS}
ALL_OBJC_CFLAGS=$(ALL_CFLAGS) @GNU_OBJC_CFLAGS@
.SUFFIXES: .m
......@@ -924,9 +913,6 @@ stamp-oldxmenu: ${OLDXMENU} ../src/$(OLDXMENU)
/* Encode the values of these two macros in Make variables,
so we can use $(...) to substitute their values within "...". */
C_SWITCH_MACHINE_1 = C_SWITCH_MACHINE
C_SWITCH_SYSTEM_1 = C_SWITCH_SYSTEM
C_SWITCH_X_SITE_1 = C_SWITCH_X_SITE
C_SWITCH_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
......@@ -936,11 +922,8 @@ $(OLDXMENU): really-lwlib
really-lwlib:
cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
@true /* make -t should not create really-lwlib. */
.PHONY: really-lwlib
#else /* not USE_X_TOOLKIT */
......@@ -949,11 +932,8 @@ $(OLDXMENU): really-oldXMenu
really-oldXMenu:
cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_SITE=$(C_SWITCH_X_SITE_1)" \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)" \
"C_SWITCH_MACHINE=$(C_SWITCH_MACHINE_1)" \
"C_SWITCH_SYSTEM=$(C_SWITCH_SYSTEM_1)"
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
@true /* make -t should not create really-oldXMenu. */
.PHONY: really-oldXMenu
#endif /* not USE_X_TOOLKIT */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment