aboutsummaryrefslogtreecommitdiffstats
path: root/oldXMenu
diff options
context:
space:
mode:
authorGlenn Morris2012-04-10 21:25:51 -0400
committerGlenn Morris2012-04-10 21:25:51 -0400
commit2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3 (patch)
tree0cfa8ab6a327acc87bca0ce43511f3261f1a9d3d /oldXMenu
parenta38c310cdd714d14c6125ddbdd89bb5bb671dd0d (diff)
downloademacs-2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3.tar.gz
emacs-2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3.zip
Repurpose C_SWITCH_X_SYSTEM as GNUSTEP_CFLAGS
This is the only thing left that uses it. * configure.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. * src/Makefile.in (GNUSTEP_CFLAGS): Rename from C_SWITCH_X_SYSTEM. * lwlib/Makefile.in (C_SWITCH_X_SYSTEM): Remove. (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. * oldXMenu/Makefile.in (C_SWITCH_X_SYSTEM): Remove. (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. * msdos/sedlibmk.inp, msdos/sed1v2.inp: GNUSTEP_CFLAGS replaces C_SWITCH_X_SYSTEM.
Diffstat (limited to 'oldXMenu')
-rw-r--r--oldXMenu/ChangeLog7
-rw-r--r--oldXMenu/Makefile.in5
2 files changed, 8 insertions, 4 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 1d3091c6bb4..5b86ccec21e 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,8 @@
12012-04-11 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (C_SWITCH_X_SYSTEM): Remove.
4 (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM.
5
12011-04-16 Paul Eggert <eggert@cs.ucla.edu> 62011-04-16 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Static checks with GCC 4.6.0 and non-default toolkits. 8 Static checks with GCC 4.6.0 and non-default toolkits.
@@ -615,7 +620,7 @@
615;; coding: utf-8 620;; coding: utf-8
616;; End: 621;; End:
617 622
618 Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. 623 Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
619 624
620 This file is part of GNU Emacs. 625 This file is part of GNU Emacs.
621 626
diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in
index 94c49fb9966..f7258d541d5 100644
--- a/oldXMenu/Makefile.in
+++ b/oldXMenu/Makefile.in
@@ -15,7 +15,7 @@
15## without express or implied warranty. 15## without express or implied warranty.
16 16
17 17
18## Copyright (C) 2001-2012 Free Software Foundation, Inc. 18## Copyright (C) 2001-2012 Free Software Foundation, Inc.
19 19
20## This program is free software: you can redistribute it and/or modify 20## This program is free software: you can redistribute it and/or modify
21## it under the terms of the GNU General Public License as published by 21## it under the terms of the GNU General Public License as published by
@@ -45,7 +45,6 @@
45srcdir=@srcdir@ 45srcdir=@srcdir@
46VPATH=@srcdir@ 46VPATH=@srcdir@
47C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ 47C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
48C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@
49C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ 48C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
50C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ 49C_SWITCH_MACHINE=@C_SWITCH_MACHINE@
51C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ 50C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@
@@ -88,7 +87,7 @@ OBJS = Activate.o \
88all:: libXMenu11.a 87all:: libXMenu11.a
89 88
90ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ 89ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
91 $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ 90 $(C_SWITCH_X_SITE) \
92 ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ 91 ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \
93 $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ 92 $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \
94 -I../src -I${srcdir} -I${srcdir}/../src 93 -I../src -I${srcdir} -I${srcdir}/../src