diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-13 21:37:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-13 21:37:44 -0700 |
| commit | bdf35b6a6a78e444563a8e321ccb42b4b4a419bd (patch) | |
| tree | e96324ace186c7acc92182a255c3aa7ff315b82f /lwlib | |
| parent | 1530927cb9a3dca7c0f41975f2e9e62ef8be92a2 (diff) | |
| parent | d5e6342ed5e408014019c478ce16a47a2aad418b (diff) | |
Merge from trunk.
Diffstat (limited to 'lwlib')
| -rw-r--r-- | lwlib/ChangeLog | 9 | ||||
| -rw-r--r-- | lwlib/Makefile.in | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index b7751f90a9..85b69f47d2 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,10 +1,15 @@ -2012-04-09 Paul Eggert <eggert@cs.ucla.edu> +2012-04-14 Paul Eggert <eggert@cs.ucla.edu> configure: new option --enable-gcc-warnings (Bug#11207) * Makefile.in (C_WARNINGS_SWITCH): Remove. (WARN_CFLAGS, WERROR_CFLAGS): New macros. (ALL_CFLAGS): Use new macros rather than old. +2012-04-11 Glenn Morris <rgm@gnu.org> + + * Makefile.in (C_SWITCH_X_SYSTEM): Remove. + (ALL_CFLAGS): Remove C_SWITCH_X_SYSTEM. + 2011-10-13 Dmitry Antipov <dmantipov@yandex.ru> * lwlib-Xaw.c (openFont, xaw_destroy_instance): Replace free with @@ -1763,7 +1768,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 76507ac4b2..d43d9ca211 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@ PROFILING_CFLAGS = @PROFILING_CFLAGS@ @@ -54,9 +53,8 @@ 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) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) \ - $(PROFILING_CFLAGS) $(CFLAGS) \ + $(C_SWITCH_MACHINE) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ -DHAVE_CONFIG_H -Demacs -I../src \ -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib |