diff options
| author | Glenn Morris | 2012-04-10 21:25:51 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-04-10 21:25:51 -0400 |
| commit | 2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3 (patch) | |
| tree | 0cfa8ab6a327acc87bca0ce43511f3261f1a9d3d /oldXMenu | |
| parent | a38c310cdd714d14c6125ddbdd89bb5bb671dd0d (diff) | |
| download | emacs-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/ChangeLog | 7 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 5 |
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 @@ | |||
| 1 | 2012-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 | |||
| 1 | 2011-04-16 Paul Eggert <eggert@cs.ucla.edu> | 6 | 2011-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 @@ | |||
| 45 | srcdir=@srcdir@ | 45 | srcdir=@srcdir@ |
| 46 | VPATH=@srcdir@ | 46 | VPATH=@srcdir@ |
| 47 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ | 47 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ |
| 48 | C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ | ||
| 49 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 48 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
| 50 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | 49 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ |
| 51 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ | 50 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ |
| @@ -88,7 +87,7 @@ OBJS = Activate.o \ | |||
| 88 | all:: libXMenu11.a | 87 | all:: libXMenu11.a |
| 89 | 88 | ||
| 90 | ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ | 89 | ALL_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 |