Commit e769f484 authored by Dan Nicolaescu's avatar Dan Nicolaescu

* Makefile.in: Remove C_SWITCH_X_MACHINE, unused.

* Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.
parent 4196ff33
2010-04-23 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused.
2010-04-11 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE)
......
......@@ -99,7 +99,7 @@ OBJS = Activate.o \
all:: libXMenu11.a
ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
$(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) $(C_SWITCH_X_MACHINE) \
$(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \
$(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
-I../src -I${srcdir} -I${srcdir}/../src
......
2010-04-23 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in: Remove C_SWITCH_X_MACHINE, unused.
* s/cygwin.h (LIBS_DEBUG): Remove, unused.
Remove redundant flags.
......
......@@ -197,10 +197,6 @@ DEPFLAGS = -MMD -MF deps/$*.d
#endif
/* These macros are for switches specifically related to X Windows. */
#ifndef C_SWITCH_X_MACHINE
#define C_SWITCH_X_MACHINE
#endif
#ifndef C_SWITCH_X_SYSTEM
#define C_SWITCH_X_SYSTEM
#endif
......@@ -240,9 +236,9 @@ shared=no
#undef C_SWITCH_SYSTEM
#undef C_SWITCH_X_SITE
/* C_SWITCH_X_SITE must come before C_SWITCH_X_MACHINE and C_SWITCH_X_SYSTEM
/* C_SWITCH_X_SITE must come before 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 ${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_SYSTEM ${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
......@@ -868,7 +864,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_X_MACHINE_1 = C_SWITCH_X_MACHINE
C_SWITCH_X_SYSTEM_1 = C_SWITCH_X_SYSTEM
#ifdef USE_X_TOOLKIT
......@@ -877,7 +872,6 @@ $(OLDXMENU): really-lwlib
really-lwlib:
cd ${lwlibdir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
@true /* make -t should not create really-lwlib. */
.PHONY: really-lwlib
......@@ -887,7 +881,6 @@ $(OLDXMENU): really-oldXMenu
really-oldXMenu:
cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \
CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' \
"C_SWITCH_X_MACHINE=$(C_SWITCH_X_MACHINE_1)" \
"C_SWITCH_X_SYSTEM=$(C_SWITCH_X_SYSTEM_1)"
@true /* make -t should not create really-oldXMenu. */
.PHONY: really-oldXMenu
......
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