diff options
| -rw-r--r-- | oldXMenu/ChangeLog | 4 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 11 |
4 files changed, 9 insertions, 10 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 1dd1e1bdd9..48e7a30020 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,7 @@ +2010-04-23 Dan Nicolaescu <[email protected]> + + * Makefile.in (ALL_CFLAGS): Remove C_SWITCH_X_MACHINE, unused. + 2010-04-11 Dan Nicolaescu <[email protected]> * Makefile.in (C_SWITCH_SYSTEM, C_SWITCH_MACHINE) diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index 2e253ab571..b729f34ee9 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -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 diff --git a/src/ChangeLog b/src/ChangeLog index 7a7fd00446..9913605316 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-04-23 Dan Nicolaescu <[email protected]> + * Makefile.in: Remove C_SWITCH_X_MACHINE, unused. + * s/cygwin.h (LIBS_DEBUG): Remove, unused. Remove redundant flags. diff --git a/src/Makefile.in b/src/Makefile.in index e6f64651b7..35f7c04916 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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 |