From 2f097256b95314f85f7c4ce5dfff9e41e1cfaeb3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Apr 2012 21:25:51 -0400 Subject: 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. --- lwlib/ChangeLog | 7 ++++++- lwlib/Makefile.in | 5 ++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'lwlib') diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index a4bb243f35..8ac9e6994a 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,8 @@ +2012-04-11 Glenn Morris + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-10-13 Dmitry Antipov * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with @@ -1756,7 +1761,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index db108862d7..eda3e2a8f5 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -1,5 +1,5 @@ # Copyright (C) 1992, 1993 Lucid, Inc. -# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 1994, 2001-2012 Free Software Foundation, Inc. # # This file is part of the Lucid Widget Library. # @@ -26,7 +26,6 @@ srcdir=@srcdir@ VPATH=@srcdir@ @SET_MAKE@ C_SWITCH_X_SITE=@C_SWITCH_X_SITE@ -C_SWITCH_X_SYSTEM=@C_SWITCH_X_SYSTEM@ C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ @@ -53,7 +52,7 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o ## $(srcdir) is where the lwlib sources are. ## There are no generated lwlib files, hence no need for -I. ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ - $(C_SWITCH_X_SYSTEM) $(C_SWITCH_MACHINE) \ + $(C_SWITCH_MACHINE) \ $(C_WARNINGS_SWITCH) $(PROFILING_CFLAGS) $(CFLAGS) \ -DHAVE_CONFIG_H -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib -- cgit v1.2.3