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 /lwlib | |
| 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 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 7 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index a4bb243f35d..8ac9e6994ab 100644 --- a/lwlib/ChangeLog +++ b/lwlib/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-10-13 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2011-10-13 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with | 8 | * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with |
| @@ -1756,7 +1761,7 @@ | |||
| 1756 | ;; coding: utf-8 | 1761 | ;; coding: utf-8 |
| 1757 | ;; End: | 1762 | ;; End: |
| 1758 | 1763 | ||
| 1759 | Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. | 1764 | Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. |
| 1760 | 1765 | ||
| 1761 | This file is part of GNU Emacs. | 1766 | This file is part of GNU Emacs. |
| 1762 | 1767 | ||
diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index db108862d70..eda3e2a8f58 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Copyright (C) 1992, 1993 Lucid, Inc. | 1 | # Copyright (C) 1992, 1993 Lucid, Inc. |
| 2 | # Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. | 2 | # Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. |
| 3 | # | 3 | # |
| 4 | # This file is part of the Lucid Widget Library. | 4 | # This file is part of the Lucid Widget Library. |
| 5 | # | 5 | # |
| @@ -26,7 +26,6 @@ srcdir=@srcdir@ | |||
| 26 | VPATH=@srcdir@ | 26 | VPATH=@srcdir@ |
| 27 | @SET_MAKE@ | 27 | @SET_MAKE@ |
| 28 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ | 28 | C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ |
| 29 | C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ | ||
| 30 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ | 29 | C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ |
| 31 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ | 30 | C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ |
| 32 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ | 31 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ |
| @@ -53,7 +52,7 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o | |||
| 53 | ## $(srcdir) is where the lwlib sources are. | 52 | ## $(srcdir) is where the lwlib sources are. |
| 54 | ## There are no generated lwlib files, hence no need for -I. | 53 | ## There are no generated lwlib files, hence no need for -I. |
| 55 | ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ | 54 | ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ |
| 56 | $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \ | 55 | $(C_SWITCH_MACHINE) \ |
| 57 | $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \ | 56 | $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \ |
| 58 | -DHAVE_CONFIG_H -Demacs -I../src \ | 57 | -DHAVE_CONFIG_H -Demacs -I../src \ |
| 59 | -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib | 58 | -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib |