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 /oldXMenu | |
| parent | 1530927cb9a3dca7c0f41975f2e9e62ef8be92a2 (diff) | |
| parent | d5e6342ed5e408014019c478ce16a47a2aad418b (diff) | |
| download | emacs-bdf35b6a6a78e444563a8e321ccb42b4b4a419bd.tar.gz | |
Merge from trunk.
Diffstat (limited to 'oldXMenu')
| -rw-r--r-- | oldXMenu/ChangeLog | 9 | ||||
| -rw-r--r-- | oldXMenu/Makefile.in | 9 |
2 files changed, 11 insertions, 7 deletions
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index 87dadb2745e..a76ea61abd8 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/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-04-16 Paul Eggert <eggert@cs.ucla.edu> Static checks with GCC 4.6.0 and non-default toolkits. @@ -622,7 +627,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index e7bc402cb0d..01855f6585b 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -1,4 +1,4 @@ -## Makefile for oldXMenu +## Makefile for oldXMenu ## Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology @@ -15,7 +15,7 @@ ## without express or implied warranty. -## Copyright (C) 2001-2012 Free Software Foundation, Inc. +## Copyright (C) 2001-2012 Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -45,7 +45,6 @@ srcdir=@srcdir@ VPATH=@srcdir@ 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@ @@ -89,8 +88,8 @@ OBJS = Activate.o \ all:: libXMenu11.a ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ - $(C_SWITCH_X_SITE) $(C_SWITCH_X_SYSTEM) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) ${C_WARNINGS_SWITCH} ${PROFILING_CFLAGS} \ + $(C_SWITCH_X_SITE) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) ${PROFILING_CFLAGS} \ $(CPPFLAGS) $(CFLAGS) -DEMACS_BITMAP_FILES \ -I../src -I${srcdir} -I${srcdir}/../src |