2004-05-24 12:50:45 +02:00
|
|
|
# @configure_input@
|
2004-08-25 10:10:02 +02:00
|
|
|
# Makefile for libcpp. Run 'configure' to generate Makefile from Makefile.in
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2015-01-05 13:33:28 +01:00
|
|
|
# Copyright (C) 2004-2015 Free Software Foundation, Inc.
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
#This file is part of libcpp.
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
#libcpp is free software; you can redistribute it and/or modify
|
|
|
|
|
#it under the terms of the GNU General Public License as published by
|
2009-04-09 17:00:19 +02:00
|
|
|
#the Free Software Foundation; either version 3, or (at your option)
|
2004-08-25 10:10:02 +02:00
|
|
|
#any later version.
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
#libcpp is distributed in the hope that it will be useful,
|
|
|
|
|
#but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
#GNU General Public License for more details.
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
#You should have received a copy of the GNU General Public License
|
2009-04-09 17:00:19 +02:00
|
|
|
#along with libcpp; see the file COPYING3. If not see
|
|
|
|
|
#<http://www.gnu.org/licenses/>.
|
2004-06-05 22:58:06 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
@SET_MAKE@
|
2004-05-24 12:50:45 +02:00
|
|
|
|
|
|
|
|
srcdir = @srcdir@
|
2004-08-25 14:57:05 +02:00
|
|
|
top_builddir = .
|
2004-05-24 12:50:45 +02:00
|
|
|
VPATH = @srcdir@
|
|
|
|
|
INSTALL = @INSTALL@
|
|
|
|
|
AR = ar
|
|
|
|
|
ARFLAGS = cru
|
|
|
|
|
ACLOCAL = @ACLOCAL@
|
|
|
|
|
AUTOCONF = @AUTOCONF@
|
|
|
|
|
AUTOHEADER = @AUTOHEADER@
|
2006-05-31 17:34:37 +02:00
|
|
|
CATALOGS = $(patsubst %,po/%,@CATALOGS@)
|
2004-05-24 12:50:45 +02:00
|
|
|
CC = @CC@
|
|
|
|
|
CFLAGS = @CFLAGS@
|
directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value.
2009-07-17 Jerry Quinn <jlquinn@optonline.net>
* directives.c (do_linemarker, do_line): Use CPP_STRING for
ignored enum value.
* files.c (find_file_in_dir): Add cast from void* to char*.
* symtab.c (ht_lookup_with_hash): Add cast from void* to char*.
* Makefile.in: (WARN_CFLAGS): Use general and C-specific
warnings.
(CXX, CXXFLAGS, WARN_CXXFLAGS, ALL_CXXFLAGS,
ENABLE_BUILD_WITH_CXX, CCDEPMODE, CXXDEPMODE, COMPILER,
COMPILER_FLAGS): New.
(DEPMODE): Set from CCDEPMODE or CXXDEPMODE.
(COMPILE.base): Use COMPILER instead of CC. Use COMPILER_FLAGS
instead of ALL_CFLAGS.
* configure.ac: Invoke AC_PROG_CXX. Separate C-specific warnings
from other warnings. Add -Wc++-compat to C-specific warnings.
Check for --enable-build-with-cxx. Set and substitute
ENABLE_BUILD_WITH_CXX. Invoke ZW_PROG_COMPILER_DEPENDENCIES
according to ENABLE_BUILD_WITH_CXX. Invoke AC_LANG before
AC_CHECK_HEADERS.
* configure: Rebuild.
* include/cpp-id-data.h: Remove extern "C".
* include/line-map.h: Likewise.
* include/mkdeps.h: Likewise.
* include/symtab.h: Likewise.
* internal.h: Likewise.
From-SVN: r149763
2009-07-18 05:22:16 +02:00
|
|
|
WARN_CFLAGS = @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@
|
|
|
|
|
CXX = @CXX@
|
|
|
|
|
CXXFLAGS = @CXXFLAGS@
|
|
|
|
|
WARN_CXXFLAGS = @warn@ @WARN_PEDANTIC@ @WERROR@
|
2004-05-24 12:50:45 +02:00
|
|
|
CPP = @CPP@
|
|
|
|
|
CPPFLAGS = @CPPFLAGS@
|
|
|
|
|
EXEEXT = @EXEEXT@
|
|
|
|
|
GMSGFMT = @GMSGFMT@
|
|
|
|
|
INCINTL = @INCINTL@
|
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
|
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
|
|
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
|
|
|
LDFLAGS = @LDFLAGS@
|
|
|
|
|
LIBICONV = @LIBICONV@
|
|
|
|
|
LIBINTL = @LIBINTL@
|
|
|
|
|
PACKAGE = @PACKAGE@
|
|
|
|
|
RANLIB = @RANLIB@
|
|
|
|
|
SHELL = @SHELL@
|
2004-08-25 10:10:02 +02:00
|
|
|
USED_CATALOGS = @USED_CATALOGS@
|
2004-05-24 12:50:45 +02:00
|
|
|
XGETTEXT = @XGETTEXT@
|
directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value.
2009-07-17 Jerry Quinn <jlquinn@optonline.net>
* directives.c (do_linemarker, do_line): Use CPP_STRING for
ignored enum value.
* files.c (find_file_in_dir): Add cast from void* to char*.
* symtab.c (ht_lookup_with_hash): Add cast from void* to char*.
* Makefile.in: (WARN_CFLAGS): Use general and C-specific
warnings.
(CXX, CXXFLAGS, WARN_CXXFLAGS, ALL_CXXFLAGS,
ENABLE_BUILD_WITH_CXX, CCDEPMODE, CXXDEPMODE, COMPILER,
COMPILER_FLAGS): New.
(DEPMODE): Set from CCDEPMODE or CXXDEPMODE.
(COMPILE.base): Use COMPILER instead of CC. Use COMPILER_FLAGS
instead of ALL_CFLAGS.
* configure.ac: Invoke AC_PROG_CXX. Separate C-specific warnings
from other warnings. Add -Wc++-compat to C-specific warnings.
Check for --enable-build-with-cxx. Set and substitute
ENABLE_BUILD_WITH_CXX. Invoke ZW_PROG_COMPILER_DEPENDENCIES
according to ENABLE_BUILD_WITH_CXX. Invoke AC_LANG before
AC_CHECK_HEADERS.
* configure: Rebuild.
* include/cpp-id-data.h: Remove extern "C".
* include/line-map.h: Likewise.
* include/mkdeps.h: Likewise.
* include/symtab.h: Likewise.
* internal.h: Likewise.
From-SVN: r149763
2009-07-18 05:22:16 +02:00
|
|
|
CCDEPMODE = @CCDEPMODE@
|
|
|
|
|
CXXDEPMODE = @CXXDEPMODE@
|
2005-06-13 10:26:05 +02:00
|
|
|
DEPDIR = @DEPDIR@
|
2011-11-03 18:17:07 +01:00
|
|
|
NOEXCEPTION_FLAGS = @noexception_flags@
|
2013-10-15 22:33:55 +02:00
|
|
|
PICFLAG = @PICFLAG@
|
2004-08-25 10:10:02 +02:00
|
|
|
|
2008-06-16 19:58:14 +02:00
|
|
|
datarootdir = @datarootdir@
|
2004-05-24 12:50:45 +02:00
|
|
|
datadir = @datadir@
|
2004-08-25 10:10:02 +02:00
|
|
|
exec_prefix = @prefix@
|
2004-05-24 12:50:45 +02:00
|
|
|
libdir = @libdir@
|
|
|
|
|
localedir = $(datadir)/locale
|
2004-08-25 10:10:02 +02:00
|
|
|
prefix = @prefix@
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
MSGMERGE = msgmerge
|
|
|
|
|
mkinstalldirs = $(SHELL) $(srcdir)/../mkinstalldirs
|
2005-06-13 10:26:05 +02:00
|
|
|
depcomp = $(SHELL) $(srcdir)/../depcomp
|
|
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
|
|
|
|
|
-I$(srcdir)/include
|
|
|
|
|
|
2013-10-15 22:33:55 +02:00
|
|
|
ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) $(PICFLAG)
|
2011-11-03 18:17:07 +01:00
|
|
|
ALL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(NOEXCEPTION_FLAGS) $(INCLUDES) \
|
2013-10-15 22:33:55 +02:00
|
|
|
$(CPPFLAGS) $(PICFLAG)
|
directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value.
2009-07-17 Jerry Quinn <jlquinn@optonline.net>
* directives.c (do_linemarker, do_line): Use CPP_STRING for
ignored enum value.
* files.c (find_file_in_dir): Add cast from void* to char*.
* symtab.c (ht_lookup_with_hash): Add cast from void* to char*.
* Makefile.in: (WARN_CFLAGS): Use general and C-specific
warnings.
(CXX, CXXFLAGS, WARN_CXXFLAGS, ALL_CXXFLAGS,
ENABLE_BUILD_WITH_CXX, CCDEPMODE, CXXDEPMODE, COMPILER,
COMPILER_FLAGS): New.
(DEPMODE): Set from CCDEPMODE or CXXDEPMODE.
(COMPILE.base): Use COMPILER instead of CC. Use COMPILER_FLAGS
instead of ALL_CFLAGS.
* configure.ac: Invoke AC_PROG_CXX. Separate C-specific warnings
from other warnings. Add -Wc++-compat to C-specific warnings.
Check for --enable-build-with-cxx. Set and substitute
ENABLE_BUILD_WITH_CXX. Invoke ZW_PROG_COMPILER_DEPENDENCIES
according to ENABLE_BUILD_WITH_CXX. Invoke AC_LANG before
AC_CHECK_HEADERS.
* configure: Rebuild.
* include/cpp-id-data.h: Remove extern "C".
* include/line-map.h: Likewise.
* include/mkdeps.h: Likewise.
* include/symtab.h: Likewise.
* internal.h: Likewise.
From-SVN: r149763
2009-07-18 05:22:16 +02:00
|
|
|
|
|
|
|
|
# The name of the compiler to use.
|
|
|
|
|
COMPILER = $(CXX)
|
|
|
|
|
COMPILER_FLAGS = $(ALL_CXXFLAGS)
|
|
|
|
|
DEPMODE = $(CXXDEPMODE)
|
|
|
|
|
|
2004-09-24 23:39:06 +02:00
|
|
|
|
2007-07-30 20:29:20 +02:00
|
|
|
libcpp_a_OBJS = charset.o directives.o directives-only.o errors.o \
|
|
|
|
|
expr.o files.o identifiers.o init.o lex.o line-map.o macro.o \
|
|
|
|
|
mkdeps.o pch.o symtab.o traditional.o
|
2004-08-25 10:10:02 +02:00
|
|
|
|
2007-07-30 20:29:20 +02:00
|
|
|
libcpp_a_SOURCES = charset.c directives.c directives-only.c errors.c \
|
|
|
|
|
expr.c files.c identifiers.c init.c lex.c line-map.c macro.c \
|
|
|
|
|
mkdeps.c pch.c symtab.c traditional.c
|
2004-05-24 12:50:45 +02:00
|
|
|
|
re PR preprocessor/34695 (Preprocessor warning->error conversion from -Werror is silent)
PR preprocessor/34695
gcc:
* Makefile.in (c-opts.o): Depend on c-tree.h.
* c-common.c: Move down include of diagnostic.h.
(done_lexing, c_cpp_error): New.
* c-common.h (done_lexing): Declare.
* c-decl.c (c_write_global_declarations): Don't check cpp_errors
(parse_in).
* c-opts.c: Include c-tree.h.
(c_common_init_options): Set preprocessor error callback.
(c_common_handle_option): Do not set preprocessor
inhibit_warnings, warnings_are_errors, warn_system_headers,
pedantic_errors or inhibit_warnings flags.
(c_common_post_options): Do not check cpp_errors (parse_in).
(c_common_finish): Do not output dependencies if there were
errors. Do not check return value of cpp_finish.
* c-ppoutput.c (pp_file_change): Set input_location.
* c-tree.h (c_cpp_error): Declare.
* diagnostic.c (diagnostic_set_info_translated): Also initialize
override_column.
(diagnostic_build_prefix): Check override_column.
* diagnostic.h (diagnostic_info): Add override_column field.
(diagnostic_override_column): Define.
gcc/cp:
* cp-tree.h (cp_cpp_error): Remove.
* error.c (cp_cpp_error): Remove.
* parser.c (cp_lexer_new_main): Set done_lexing instead of
client_diagnostic and error callback.
gcc/fortran:
* cpp.c (cb_cpp_error): New.
(gfc_cpp_post_options): Don't set cpp_option->inhibit_warnings.
Don't check cpp_errors (cpp_in).
(gfc_cpp_init_0): Set cb->error.
gcc/testsuite:
* gcc.dg/builtin-redefine.c, gcc.dg/cpp/redef2.c,
gcc.dg/cpp/redef3.c, gcc.dg/cpp/trad/redef2.c: Use dg-message
instead of dg-warning for "previous definition" messages.
* gcc.dg/cpp/Wvariadic-1.c, gcc.dg/cpp/Wvariadic-3.c: Expect
"warnings being treated as errors" message.
* gcc.dg/fltconst-1.c: Use -fshow-column.
libcpp:
* makedepend.c: Remove.
* Makefile.in (makedepend_OBJS, makedepend$(EXEEXT)): Remove.
(all, clean, TAGS_SOURCES, include): Remove makedepend handling.
* directives.c (cpp_errors): Remove.
* errors.c (print_location, _cpp_begin_message, v_message):
Remove.
(cpp_error, cpp_error_with_line): Always use error callback.
(cpp_error, cpp_error_with_line, cpp_errno): Return bool.
* include/cpplib.h (cpp_options): Remove pedantic_errors,
inhibit_warnings, warn_system_headers, inhibit_errors,
warnings_are_errors, client_diagnostic.
(cpp_callbacks): Add extra arguments to error callback; make it
return bool.
(cpp_finish): Return void.
(cpp_destroy): Remove inaccurate comment about return value.
(cpp_errors, CPP_DL_EXTRACT, CPP_DL_WARNING_P): Remove.
(CPP_DL_NOTE): Define.
* include/line-map.h (linemap_print_containing_files): Remove.
* init.c (cpp_finish): Do not check for or return number of
errors.
* internal.h (cpp_reader): Remove errors field.
* line-map.c (linemap_print_containing_files): Remove.
* macro.c (_cpp_create_definition): Use CPP_DL_NOTE for message
about previous definition. Only emit it if previous diagnostic
was emitted.
From-SVN: r145263
2009-03-30 00:56:07 +02:00
|
|
|
all: libcpp.a $(USED_CATALOGS)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
|
|
|
|
.SUFFIXES:
|
|
|
|
|
.SUFFIXES: .c .gmo .o .obj .po .pox
|
|
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
libcpp.a: $(libcpp_a_OBJS)
|
2004-05-24 12:50:45 +02:00
|
|
|
-rm -f libcpp.a
|
2004-08-25 10:10:02 +02:00
|
|
|
$(AR) $(ARFLAGS) libcpp.a $(libcpp_a_OBJS)
|
2004-05-24 12:50:45 +02:00
|
|
|
$(RANLIB) libcpp.a
|
|
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
# Rules to rebuild the configuration
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
Makefile: $(srcdir)/Makefile.in config.status
|
|
|
|
|
$(SHELL) ./config.status Makefile
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
config.status: $(srcdir)/configure
|
|
|
|
|
$(SHELL) ./config.status --recheck
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
$(srcdir)/configure: @MAINT@ $(srcdir)/aclocal.m4
|
|
|
|
|
cd $(srcdir) && $(AUTOCONF)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
$(srcdir)/aclocal.m4: @MAINT@ $(srcdir)/../config/acx.m4 \
|
gettext-sister.m4: Renamed from gettext.m4
config/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* gettext-sister.m4: Renamed from gettext.m4
* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
lib-link.m4, lib-prefix.m4, nls.m4, progtest.m4, stdint_h.m4,
uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.
gcc/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* aclocal.m4: Update for rename of gettext-sister.m4.
libcpp/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (aclocal.m4): Update dependencies.
* configure.ac (AC_CONFIG_MACRO_DIR): New.
* aclocal.m4, configure: Regenerate.
intl/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac (AC_CONFIG_MACRO_DIR): New.
(ACLOCAL, AUTOCONF, AUTOHEADER, MAINT): Substitute.
* Makefile.in: Update with maintainer mode rules.
* README: Update aclocal regeneration instructions.
* aclocal.m4, configure: Regenerate.
From-SVN: r87900
2004-09-23 01:53:59 +02:00
|
|
|
$(srcdir)/../config/gettext-sister.m4 $(srcdir)/../config/iconv.m4 \
|
|
|
|
|
$(srcdir)/../config/codeset.m4 $(srcdir)/../config/lib-ld.m4 \
|
|
|
|
|
$(srcdir)/../config/lib-link.m4 $(srcdir)/../config/lib-prefix.m4 \
|
2008-06-18 01:13:35 +02:00
|
|
|
$(srcdir)/../config/override.m4 $(srcdir)/../config/proginstall.m4 \
|
gettext-sister.m4: Renamed from gettext.m4
config/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* gettext-sister.m4: Renamed from gettext.m4
* codeset.m4, gettext.m4, glibc21.m4, iconv.m4, intdiv0.m4, po.m4,
inttypes.m4, inttypes-pri.m4, inttypes_h.m4, lcmessage.m4, lib-ld.m4,
lib-link.m4, lib-prefix.m4, nls.m4, progtest.m4, stdint_h.m4,
uintmax_t.m4, ulonglong.m4: Import from gettext-0.12.1 sources.
gcc/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* aclocal.m4: Update for rename of gettext-sister.m4.
libcpp/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* Makefile.in (aclocal.m4): Update dependencies.
* configure.ac (AC_CONFIG_MACRO_DIR): New.
* aclocal.m4, configure: Regenerate.
intl/
2004-09-22 Kelley Cook <kcook@gcc.gnu.org>
* configure.ac (AC_CONFIG_MACRO_DIR): New.
(ACLOCAL, AUTOCONF, AUTOHEADER, MAINT): Substitute.
* Makefile.in: Update with maintainer mode rules.
* README: Update aclocal regeneration instructions.
* aclocal.m4, configure: Regenerate.
From-SVN: r87900
2004-09-23 01:53:59 +02:00
|
|
|
$(srcdir)/configure.ac
|
2004-08-25 10:10:02 +02:00
|
|
|
cd $(srcdir) && $(ACLOCAL) -I ../config
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
config.h: stamp-h1
|
|
|
|
|
test -f config.h || (rm -f stamp-h1 && $(MAKE) stamp-h1)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
stamp-h1: $(srcdir)/config.in config.status
|
|
|
|
|
-rm -f stamp-h1
|
|
|
|
|
$(SHELL) ./config.status config.h
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2008-02-26 12:41:01 +01:00
|
|
|
$(srcdir)/config.in: @MAINT@ $(srcdir)/configure.ac
|
2004-08-25 10:10:02 +02:00
|
|
|
cd $(srcdir) && $(AUTOHEADER)
|
|
|
|
|
-rm -f stamp-h1
|
2004-09-24 23:39:06 +02:00
|
|
|
|
|
|
|
|
# It is not possible to get LOCALEDIR defined in config.h because
|
|
|
|
|
# the value it needs to be defined to is only determined in the
|
|
|
|
|
# Makefile. Hence we do this instead.
|
|
|
|
|
localedir.h: localedir.hs; @true
|
|
|
|
|
localedir.hs: Makefile
|
|
|
|
|
echo "#define LOCALEDIR \"$(localedir)\"" > localedir.new
|
|
|
|
|
$(srcdir)/../move-if-change localedir.new localedir.h
|
|
|
|
|
echo timestamp > localedir.hs
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
# Installation rules and other phony targets
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
# These rule has to look for .gmo modules in both srcdir and
|
|
|
|
|
# the cwd, and has to check that we actually have a catalog
|
|
|
|
|
# for each language, in case they weren't built or included
|
|
|
|
|
# with the distribution.
|
|
|
|
|
installdirs:
|
|
|
|
|
@$(mkinstalldirs) $(DESTDIR)$(datadir); \
|
|
|
|
|
cats="$(CATALOGS)"; for cat in $$cats; do \
|
|
|
|
|
lang=`basename $$cat | sed 's/\.gmo$$//'`; \
|
|
|
|
|
if [ -f $$cat ] || [ -f $(srcdir)/$$cat ]; then \
|
|
|
|
|
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
|
|
|
|
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
|
|
|
|
|
fi; \
|
|
|
|
|
done
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
install-strip install: all installdirs
|
|
|
|
|
cats="$(CATALOGS)"; for cat in $$cats; do \
|
|
|
|
|
lang=`basename $$cat | sed 's/\.gmo$$//'`; \
|
|
|
|
|
if [ -f $$cat ]; then :; \
|
|
|
|
|
elif [ -f $(srcdir)/$$cat ]; then cat=$(srcdir)/$$cat; \
|
|
|
|
|
else continue; \
|
|
|
|
|
fi; \
|
|
|
|
|
dir=$(localedir)/$$lang/LC_MESSAGES; \
|
|
|
|
|
echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
|
|
|
|
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
|
|
|
|
|
done
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
mostlyclean:
|
|
|
|
|
-rm -f *.o
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
clean: mostlyclean
|
re PR preprocessor/34695 (Preprocessor warning->error conversion from -Werror is silent)
PR preprocessor/34695
gcc:
* Makefile.in (c-opts.o): Depend on c-tree.h.
* c-common.c: Move down include of diagnostic.h.
(done_lexing, c_cpp_error): New.
* c-common.h (done_lexing): Declare.
* c-decl.c (c_write_global_declarations): Don't check cpp_errors
(parse_in).
* c-opts.c: Include c-tree.h.
(c_common_init_options): Set preprocessor error callback.
(c_common_handle_option): Do not set preprocessor
inhibit_warnings, warnings_are_errors, warn_system_headers,
pedantic_errors or inhibit_warnings flags.
(c_common_post_options): Do not check cpp_errors (parse_in).
(c_common_finish): Do not output dependencies if there were
errors. Do not check return value of cpp_finish.
* c-ppoutput.c (pp_file_change): Set input_location.
* c-tree.h (c_cpp_error): Declare.
* diagnostic.c (diagnostic_set_info_translated): Also initialize
override_column.
(diagnostic_build_prefix): Check override_column.
* diagnostic.h (diagnostic_info): Add override_column field.
(diagnostic_override_column): Define.
gcc/cp:
* cp-tree.h (cp_cpp_error): Remove.
* error.c (cp_cpp_error): Remove.
* parser.c (cp_lexer_new_main): Set done_lexing instead of
client_diagnostic and error callback.
gcc/fortran:
* cpp.c (cb_cpp_error): New.
(gfc_cpp_post_options): Don't set cpp_option->inhibit_warnings.
Don't check cpp_errors (cpp_in).
(gfc_cpp_init_0): Set cb->error.
gcc/testsuite:
* gcc.dg/builtin-redefine.c, gcc.dg/cpp/redef2.c,
gcc.dg/cpp/redef3.c, gcc.dg/cpp/trad/redef2.c: Use dg-message
instead of dg-warning for "previous definition" messages.
* gcc.dg/cpp/Wvariadic-1.c, gcc.dg/cpp/Wvariadic-3.c: Expect
"warnings being treated as errors" message.
* gcc.dg/fltconst-1.c: Use -fshow-column.
libcpp:
* makedepend.c: Remove.
* Makefile.in (makedepend_OBJS, makedepend$(EXEEXT)): Remove.
(all, clean, TAGS_SOURCES, include): Remove makedepend handling.
* directives.c (cpp_errors): Remove.
* errors.c (print_location, _cpp_begin_message, v_message):
Remove.
(cpp_error, cpp_error_with_line): Always use error callback.
(cpp_error, cpp_error_with_line, cpp_errno): Return bool.
* include/cpplib.h (cpp_options): Remove pedantic_errors,
inhibit_warnings, warn_system_headers, inhibit_errors,
warnings_are_errors, client_diagnostic.
(cpp_callbacks): Add extra arguments to error callback; make it
return bool.
(cpp_finish): Return void.
(cpp_destroy): Remove inaccurate comment about return value.
(cpp_errors, CPP_DL_EXTRACT, CPP_DL_WARNING_P): Remove.
(CPP_DL_NOTE): Define.
* include/line-map.h (linemap_print_containing_files): Remove.
* init.c (cpp_finish): Do not check for or return number of
errors.
* internal.h (cpp_reader): Remove errors field.
* line-map.c (linemap_print_containing_files): Remove.
* macro.c (_cpp_create_definition): Use CPP_DL_NOTE for message
about previous definition. Only emit it if previous diagnostic
was emitted.
From-SVN: r145263
2009-03-30 00:56:07 +02:00
|
|
|
-rm -rf libcpp.a $(srcdir)/autom4te.cache
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
distclean: clean
|
|
|
|
|
-rm -f config.h stamp-h1 config.status config.cache config.log \
|
2004-09-24 23:39:06 +02:00
|
|
|
configure.lineno configure.status.lineno Makefile localedir.h \
|
2005-06-13 10:26:05 +02:00
|
|
|
localedir.hs $(DEPDIR)/*.Po
|
|
|
|
|
-rmdir $(DEPDIR)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
maintainer-clean: distclean
|
|
|
|
|
@echo "This command is intended for maintainers to use"
|
|
|
|
|
@echo "it deletes files that may require special tools to rebuild."
|
|
|
|
|
-rm -f $(srcdir)/configure $(srcdir)/aclocal.m4
|
|
|
|
|
|
|
|
|
|
check:
|
|
|
|
|
installcheck:
|
|
|
|
|
dvi:
|
2006-10-11 01:48:09 +02:00
|
|
|
pdf:
|
2004-08-25 10:10:02 +02:00
|
|
|
html:
|
|
|
|
|
info:
|
|
|
|
|
install-info:
|
2007-03-02 00:56:24 +01:00
|
|
|
install-pdf:
|
2004-05-24 12:50:45 +02:00
|
|
|
install-man:
|
2006-05-24 03:48:20 +02:00
|
|
|
install-html:
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
update-po: $(CATALOGS:.gmo=.pox)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
.PHONY: installdirs install install-strip mostlyclean clean distclean \
|
2006-10-11 01:48:09 +02:00
|
|
|
maintainer-clean check installcheck dvi pdf html info install-info \
|
2006-05-24 03:48:20 +02:00
|
|
|
install-man update-po install-html
|
2004-05-24 12:50:45 +02:00
|
|
|
|
2005-06-13 10:26:05 +02:00
|
|
|
# Dependency rule.
|
directives.c (do_linemarker, do_line): Use CPP_STRING for ignored enum value.
2009-07-17 Jerry Quinn <jlquinn@optonline.net>
* directives.c (do_linemarker, do_line): Use CPP_STRING for
ignored enum value.
* files.c (find_file_in_dir): Add cast from void* to char*.
* symtab.c (ht_lookup_with_hash): Add cast from void* to char*.
* Makefile.in: (WARN_CFLAGS): Use general and C-specific
warnings.
(CXX, CXXFLAGS, WARN_CXXFLAGS, ALL_CXXFLAGS,
ENABLE_BUILD_WITH_CXX, CCDEPMODE, CXXDEPMODE, COMPILER,
COMPILER_FLAGS): New.
(DEPMODE): Set from CCDEPMODE or CXXDEPMODE.
(COMPILE.base): Use COMPILER instead of CC. Use COMPILER_FLAGS
instead of ALL_CFLAGS.
* configure.ac: Invoke AC_PROG_CXX. Separate C-specific warnings
from other warnings. Add -Wc++-compat to C-specific warnings.
Check for --enable-build-with-cxx. Set and substitute
ENABLE_BUILD_WITH_CXX. Invoke ZW_PROG_COMPILER_DEPENDENCIES
according to ENABLE_BUILD_WITH_CXX. Invoke AC_LANG before
AC_CHECK_HEADERS.
* configure: Rebuild.
* include/cpp-id-data.h: Remove extern "C".
* include/line-map.h: Likewise.
* include/mkdeps.h: Likewise.
* include/symtab.h: Likewise.
* internal.h: Likewise.
From-SVN: r149763
2009-07-18 05:22:16 +02:00
|
|
|
COMPILE.base = $(COMPILER) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(COMPILER_FLAGS) -c
|
2005-06-13 10:26:05 +02:00
|
|
|
ifeq ($(DEPMODE),depmode=gcc3)
|
2008-03-28 14:32:47 +01:00
|
|
|
# Note that we put the dependencies into a .Tpo file, then move them
|
|
|
|
|
# into place if the compile succeeds. We need this because gcc does
|
|
|
|
|
# not atomically write the dependency output file.
|
|
|
|
|
COMPILE = $(COMPILE.base) -o $@ -MT $@ -MMD -MP -MF $(DEPDIR)/$*.Tpo
|
|
|
|
|
POSTCOMPILE = @mv $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
2005-06-13 10:26:05 +02:00
|
|
|
else
|
|
|
|
|
COMPILE = source='$<' object='$@' libtool=no DEPDIR=$(DEPDIR) $(DEPMODE) \
|
|
|
|
|
$(depcomp) $(COMPILE.base)
|
2008-03-28 14:32:47 +01:00
|
|
|
# depcomp handles atomicity for us, so we don't need a postcompile
|
|
|
|
|
# step.
|
|
|
|
|
POSTCOMPILE =
|
2005-06-13 10:26:05 +02:00
|
|
|
endif
|
|
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
# Implicit rules and I18N
|
2004-06-09 11:07:11 +02:00
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
.c.o:
|
2005-06-13 10:26:05 +02:00
|
|
|
$(COMPILE) $<
|
2008-03-28 14:32:47 +01:00
|
|
|
$(POSTCOMPILE)
|
2004-05-24 12:50:45 +02:00
|
|
|
|
|
|
|
|
# N.B. We do not attempt to copy these into $(srcdir).
|
|
|
|
|
.po.gmo:
|
2009-01-05 11:35:40 +01:00
|
|
|
$(mkinstalldirs) po
|
2004-05-24 12:50:45 +02:00
|
|
|
$(GMSGFMT) --statistics -o $@ $<
|
|
|
|
|
|
|
|
|
|
# The new .po has to be gone over by hand, so we deposit it into
|
|
|
|
|
# build/po with a different extension.
|
|
|
|
|
# If build/po/$(PACKAGE).pot exists, use it (it was just created),
|
|
|
|
|
# else use the one in srcdir.
|
|
|
|
|
.po.pox:
|
2009-01-05 11:35:40 +01:00
|
|
|
$(mkinstalldirs) po
|
2004-05-24 12:50:45 +02:00
|
|
|
$(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \
|
|
|
|
|
then echo po/$(PACKAGE).pot; \
|
|
|
|
|
else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@
|
|
|
|
|
|
2004-08-25 10:10:02 +02:00
|
|
|
# Rule for regenerating the message template.
|
2004-11-09 22:58:43 +01:00
|
|
|
$(PACKAGE).pot: po/$(PACKAGE).pot
|
2004-08-25 10:10:02 +02:00
|
|
|
po/$(PACKAGE).pot: $(libcpp_a_SOURCES)
|
2009-03-28 07:57:44 +01:00
|
|
|
$(mkinstalldirs) $(srcdir)/po
|
2004-05-24 12:50:45 +02:00
|
|
|
$(XGETTEXT) --default-domain=$(PACKAGE) \
|
2004-11-09 22:58:43 +01:00
|
|
|
--keyword=_ --keyword=N_ \
|
diagnostic.h (diagnostic_override_option_index): New macro to set a diagnostic's option_index.
* diagnostic.h (diagnostic_override_option_index): New macro to
set a diagnostic's option_index.
* c-tree.h (c_cpp_error): Add warning reason argument.
* opts.c (_warning_as_error_callback): New.
(register_warning_as_error_callback): Store callback for
warnings enabled via enable_warning_as_error.
(enable_warning_as_error): Call callback, minor code tidy.
* opts.h (register_warning_as_error_callback): Declare.
* c-opts.c (warning_as_error_callback): New, set cpp_opts flag in
response to -Werror=.
(c_common_init_options): Register warning_as_error_callback in opts.c.
* common.opt: Add -Wno-cpp option.
* c-common.c (struct reason_option_codes_t): Map cpp warning
reason codes to gcc option indexes.
* (c_option_controlling_cpp_error): New function, lookup the gcc
option index for a cpp warning reason code.
* (c_cpp_error): Add warning reason argument, call
c_option_controlling_cpp_error for diagnostic_override_option_index.
* doc/invoke.texi: Document -Wno-cpp.
* cpp.c (cb_cpp_error): Add warning reason argument, set a value
for diagnostic_override_option_index if CPP_W_WARNING_DIRECTIVE.
* directives.c (do_diagnostic): Add warning reason argument,
call appropriate error reporting function for code.
(directive_diagnostics): Call specific warning functions with
warning reason where appropriate.
(do_error, do_warning, do_pragma_dependency): Add warning reason
argument to do_diagnostic calls.
* macro.c (_cpp_warn_if_unused_macro, enter_macro_context,
_cpp_create_definition): Call specific warning functions with
warning reason where appropriate.
* Makefile.in: Add new diagnostic functions to gettext translations.
* include/cpplib.h (struct cpp_callbacks): Add warning reason code
to error callback.
(CPP_DL_WARNING, CPP_DL_WARNING_SYSHDR, CPP_DL_PEDWARN, CPP_DL_ERROR,
CPP_DL_ICE, CPP_DL_NOTE, CPP_DL_FATAL): Replace macros with enums.
(CPP_W_NONE, CPP_W_DEPRECATED, CPP_W_COMMENTS,
CPP_W_MISSING_INCLUDE_DIRS, CPP_W_TRIGRAPHS, CPP_W_MULTICHAR,
CPP_W_TRADITIONAL, CPP_W_LONG_LONG, CPP_W_ENDIF_LABELS,
CPP_W_NUM_SIGN_CHANGE, CPP_W_VARIADIC_MACROS,
CPP_W_BUILTIN_MACRO_REDEFINED, CPP_W_DOLLARS, CPP_W_UNDEF,
CPP_W_UNUSED_MACROS, CPP_W_CXX_OPERATOR_NAMES, CPP_W_NORMALIZE,
CPP_W_INVALID_PCH, CPP_W_WARNING_DIRECTIVE): New enums for cpp
warning reason codes.
(cpp_warning, cpp_pedwarning, cpp_warning_syshdr,
cpp_warning_with_line, cpp_pedwarning_with_line,
cpp_warning_with_line_syshdr): New specific error reporting functions.
* pch.c (cpp_valid_state): Call specific warning functions with
warning reason where appropriate.
* errors.c (cpp_diagnostic, cpp_diagnostic_with_line): New central
diagnostic handlers.
(cpp_warning, cpp_pedwarning, cpp_warning_syshdr,
cpp_warning_with_line, cpp_pedwarning_with_line,
cpp_warning_with_line_syshdr): New specific error reporting functions.
* expr.c (cpp_classify_number, eval_token, num_unary_op): Call
specific warning functions with warning reason where appropriate.
* lex.c (_cpp_process_line_notes, _cpp_skip_block_comment,
warn_about_normalization, lex_identifier_intern, lex_identifier,
_cpp_lex_direct): Ditto.
* charset.c (_cpp_valid_ucn, convert_hex, convert_escape,
narrow_str_to_charconst): Ditto.
* gcc.dg/cpp/warn-undef-2.c: New.
* gcc.dg/cpp/warn-traditional-2.c: New.
* gcc.dg/cpp/warn-comments-2.c: New.
* gcc.dg/cpp/warning-directive-1.c: New.
* gcc.dg/cpp/warn-long-long.c: New.
* gcc.dg/cpp/warn-traditional.c: New.
* gcc.dg/cpp/warn-variadic-2.c: New.
* gcc.dg/cpp/warn-undef.c: New.
* gcc.dg/cpp/warn-normalized-1.c: New.
* gcc.dg/cpp/warning-directive-2.c: New.
* gcc.dg/cpp/warn-long-long-2.c: New.
* gcc.dg/cpp/warn-variadic.c: New.
* gcc.dg/cpp/warn-normalized-2.c: New.
* gcc.dg/cpp/warning-directive-3.c: New.
* gcc.dg/cpp/warn-deprecated-2.c: New.
* gcc.dg/cpp/warn-trigraphs-1.c: New.
* gcc.dg/cpp/warn-multichar-2.c: New.
* gcc.dg/cpp/warn-normalized-3.c: New.
* gcc.dg/cpp/warning-directive-4.c: New.
* gcc.dg/cpp/warn-unused-macros.c: New.
* gcc.dg/cpp/warn-trigraphs-2.c: New.
* gcc.dg/cpp/warn-cxx-compat-2.c: New.
* gcc.dg/cpp/warn-cxx-compat.c: New.
* gcc.dg/cpp/warn-redefined.c: New.
* gcc.dg/cpp/warn-trigraphs-3.c: New.
* gcc.dg/cpp/warn-unused-macros-2.c: New.
* gcc.dg/cpp/warn-deprecated.c: New.
* gcc.dg/cpp/warn-trigraphs-4.c: New.
* gcc.dg/cpp/warn-redefined-2.c: New.
* gcc.dg/cpp/warn-comments.c: New.
* gcc.dg/cpp/warn-multichar.c: New.
* g++.dg/cpp/warning-directive-1.C: New.
* g++.dg/cpp/warning-directive-2.C: New.
* g++.dg/cpp/warning-directive-3.C: New.
* g++.dg/cpp/warning-directive-4.C: New.
* gfortran.dg/warning-directive-1.F90: New.
* gfortran.dg/warning-directive-3.F90: New.
* gfortran.dg/warning-directive-2.F90: New.
* gfortran.dg/warning-directive-4.F90: New.
From-SVN: r158079
2010-04-07 19:18:10 +02:00
|
|
|
--keyword=cpp_error:3 \
|
|
|
|
|
--keyword=cpp_warning:3 \
|
|
|
|
|
--keyword=cpp_pedwarning:3 \
|
|
|
|
|
--keyword=cpp_warning_syshdr:3 \
|
2004-11-09 22:58:43 +01:00
|
|
|
--keyword=cpp_error_with_line:5 \
|
diagnostic.h (diagnostic_override_option_index): New macro to set a diagnostic's option_index.
* diagnostic.h (diagnostic_override_option_index): New macro to
set a diagnostic's option_index.
* c-tree.h (c_cpp_error): Add warning reason argument.
* opts.c (_warning_as_error_callback): New.
(register_warning_as_error_callback): Store callback for
warnings enabled via enable_warning_as_error.
(enable_warning_as_error): Call callback, minor code tidy.
* opts.h (register_warning_as_error_callback): Declare.
* c-opts.c (warning_as_error_callback): New, set cpp_opts flag in
response to -Werror=.
(c_common_init_options): Register warning_as_error_callback in opts.c.
* common.opt: Add -Wno-cpp option.
* c-common.c (struct reason_option_codes_t): Map cpp warning
reason codes to gcc option indexes.
* (c_option_controlling_cpp_error): New function, lookup the gcc
option index for a cpp warning reason code.
* (c_cpp_error): Add warning reason argument, call
c_option_controlling_cpp_error for diagnostic_override_option_index.
* doc/invoke.texi: Document -Wno-cpp.
* cpp.c (cb_cpp_error): Add warning reason argument, set a value
for diagnostic_override_option_index if CPP_W_WARNING_DIRECTIVE.
* directives.c (do_diagnostic): Add warning reason argument,
call appropriate error reporting function for code.
(directive_diagnostics): Call specific warning functions with
warning reason where appropriate.
(do_error, do_warning, do_pragma_dependency): Add warning reason
argument to do_diagnostic calls.
* macro.c (_cpp_warn_if_unused_macro, enter_macro_context,
_cpp_create_definition): Call specific warning functions with
warning reason where appropriate.
* Makefile.in: Add new diagnostic functions to gettext translations.
* include/cpplib.h (struct cpp_callbacks): Add warning reason code
to error callback.
(CPP_DL_WARNING, CPP_DL_WARNING_SYSHDR, CPP_DL_PEDWARN, CPP_DL_ERROR,
CPP_DL_ICE, CPP_DL_NOTE, CPP_DL_FATAL): Replace macros with enums.
(CPP_W_NONE, CPP_W_DEPRECATED, CPP_W_COMMENTS,
CPP_W_MISSING_INCLUDE_DIRS, CPP_W_TRIGRAPHS, CPP_W_MULTICHAR,
CPP_W_TRADITIONAL, CPP_W_LONG_LONG, CPP_W_ENDIF_LABELS,
CPP_W_NUM_SIGN_CHANGE, CPP_W_VARIADIC_MACROS,
CPP_W_BUILTIN_MACRO_REDEFINED, CPP_W_DOLLARS, CPP_W_UNDEF,
CPP_W_UNUSED_MACROS, CPP_W_CXX_OPERATOR_NAMES, CPP_W_NORMALIZE,
CPP_W_INVALID_PCH, CPP_W_WARNING_DIRECTIVE): New enums for cpp
warning reason codes.
(cpp_warning, cpp_pedwarning, cpp_warning_syshdr,
cpp_warning_with_line, cpp_pedwarning_with_line,
cpp_warning_with_line_syshdr): New specific error reporting functions.
* pch.c (cpp_valid_state): Call specific warning functions with
warning reason where appropriate.
* errors.c (cpp_diagnostic, cpp_diagnostic_with_line): New central
diagnostic handlers.
(cpp_warning, cpp_pedwarning, cpp_warning_syshdr,
cpp_warning_with_line, cpp_pedwarning_with_line,
cpp_warning_with_line_syshdr): New specific error reporting functions.
* expr.c (cpp_classify_number, eval_token, num_unary_op): Call
specific warning functions with warning reason where appropriate.
* lex.c (_cpp_process_line_notes, _cpp_skip_block_comment,
warn_about_normalization, lex_identifier_intern, lex_identifier,
_cpp_lex_direct): Ditto.
* charset.c (_cpp_valid_ucn, convert_hex, convert_escape,
narrow_str_to_charconst): Ditto.
* gcc.dg/cpp/warn-undef-2.c: New.
* gcc.dg/cpp/warn-traditional-2.c: New.
* gcc.dg/cpp/warn-comments-2.c: New.
* gcc.dg/cpp/warning-directive-1.c: New.
* gcc.dg/cpp/warn-long-long.c: New.
* gcc.dg/cpp/warn-traditional.c: New.
* gcc.dg/cpp/warn-variadic-2.c: New.
* gcc.dg/cpp/warn-undef.c: New.
* gcc.dg/cpp/warn-normalized-1.c: New.
* gcc.dg/cpp/warning-directive-2.c: New.
* gcc.dg/cpp/warn-long-long-2.c: New.
* gcc.dg/cpp/warn-variadic.c: New.
* gcc.dg/cpp/warn-normalized-2.c: New.
* gcc.dg/cpp/warning-directive-3.c: New.
* gcc.dg/cpp/warn-deprecated-2.c: New.
* gcc.dg/cpp/warn-trigraphs-1.c: New.
* gcc.dg/cpp/warn-multichar-2.c: New.
* gcc.dg/cpp/warn-normalized-3.c: New.
* gcc.dg/cpp/warning-directive-4.c: New.
* gcc.dg/cpp/warn-unused-macros.c: New.
* gcc.dg/cpp/warn-trigraphs-2.c: New.
* gcc.dg/cpp/warn-cxx-compat-2.c: New.
* gcc.dg/cpp/warn-cxx-compat.c: New.
* gcc.dg/cpp/warn-redefined.c: New.
* gcc.dg/cpp/warn-trigraphs-3.c: New.
* gcc.dg/cpp/warn-unused-macros-2.c: New.
* gcc.dg/cpp/warn-deprecated.c: New.
* gcc.dg/cpp/warn-trigraphs-4.c: New.
* gcc.dg/cpp/warn-redefined-2.c: New.
* gcc.dg/cpp/warn-comments.c: New.
* gcc.dg/cpp/warn-multichar.c: New.
* g++.dg/cpp/warning-directive-1.C: New.
* g++.dg/cpp/warning-directive-2.C: New.
* g++.dg/cpp/warning-directive-3.C: New.
* g++.dg/cpp/warning-directive-4.C: New.
* gfortran.dg/warning-directive-1.F90: New.
* gfortran.dg/warning-directive-3.F90: New.
* gfortran.dg/warning-directive-2.F90: New.
* gfortran.dg/warning-directive-4.F90: New.
From-SVN: r158079
2010-04-07 19:18:10 +02:00
|
|
|
--keyword=cpp_warning_with_line:5 \
|
|
|
|
|
--keyword=cpp_pedwarning_with_line:5 \
|
|
|
|
|
--keyword=cpp_warning_with_line_syshdr:5 \
|
|
|
|
|
--keyword=cpp_errno:3 \
|
2004-11-09 22:58:43 +01:00
|
|
|
--keyword=SYNTAX_ERROR --keyword=SYNTAX_ERROR2 \
|
2004-05-24 12:50:45 +02:00
|
|
|
--copyright-holder="Free Software Foundation, Inc." \
|
|
|
|
|
--msgid-bugs-address="http://gcc.gnu.org/bugs.html" \
|
2004-11-09 22:58:43 +01:00
|
|
|
--language=c -o po/$(PACKAGE).pot.tmp $^
|
|
|
|
|
sed 's:$(srcdir)/::g' <po/$(PACKAGE).pot.tmp >po/$(PACKAGE).pot
|
|
|
|
|
rm po/$(PACKAGE).pot.tmp
|
2004-08-25 10:10:02 +02:00
|
|
|
|
re PR preprocessor/34695 (Preprocessor warning->error conversion from -Werror is silent)
PR preprocessor/34695
gcc:
* Makefile.in (c-opts.o): Depend on c-tree.h.
* c-common.c: Move down include of diagnostic.h.
(done_lexing, c_cpp_error): New.
* c-common.h (done_lexing): Declare.
* c-decl.c (c_write_global_declarations): Don't check cpp_errors
(parse_in).
* c-opts.c: Include c-tree.h.
(c_common_init_options): Set preprocessor error callback.
(c_common_handle_option): Do not set preprocessor
inhibit_warnings, warnings_are_errors, warn_system_headers,
pedantic_errors or inhibit_warnings flags.
(c_common_post_options): Do not check cpp_errors (parse_in).
(c_common_finish): Do not output dependencies if there were
errors. Do not check return value of cpp_finish.
* c-ppoutput.c (pp_file_change): Set input_location.
* c-tree.h (c_cpp_error): Declare.
* diagnostic.c (diagnostic_set_info_translated): Also initialize
override_column.
(diagnostic_build_prefix): Check override_column.
* diagnostic.h (diagnostic_info): Add override_column field.
(diagnostic_override_column): Define.
gcc/cp:
* cp-tree.h (cp_cpp_error): Remove.
* error.c (cp_cpp_error): Remove.
* parser.c (cp_lexer_new_main): Set done_lexing instead of
client_diagnostic and error callback.
gcc/fortran:
* cpp.c (cb_cpp_error): New.
(gfc_cpp_post_options): Don't set cpp_option->inhibit_warnings.
Don't check cpp_errors (cpp_in).
(gfc_cpp_init_0): Set cb->error.
gcc/testsuite:
* gcc.dg/builtin-redefine.c, gcc.dg/cpp/redef2.c,
gcc.dg/cpp/redef3.c, gcc.dg/cpp/trad/redef2.c: Use dg-message
instead of dg-warning for "previous definition" messages.
* gcc.dg/cpp/Wvariadic-1.c, gcc.dg/cpp/Wvariadic-3.c: Expect
"warnings being treated as errors" message.
* gcc.dg/fltconst-1.c: Use -fshow-column.
libcpp:
* makedepend.c: Remove.
* Makefile.in (makedepend_OBJS, makedepend$(EXEEXT)): Remove.
(all, clean, TAGS_SOURCES, include): Remove makedepend handling.
* directives.c (cpp_errors): Remove.
* errors.c (print_location, _cpp_begin_message, v_message):
Remove.
(cpp_error, cpp_error_with_line): Always use error callback.
(cpp_error, cpp_error_with_line, cpp_errno): Return bool.
* include/cpplib.h (cpp_options): Remove pedantic_errors,
inhibit_warnings, warn_system_headers, inhibit_errors,
warnings_are_errors, client_diagnostic.
(cpp_callbacks): Add extra arguments to error callback; make it
return bool.
(cpp_finish): Return void.
(cpp_destroy): Remove inaccurate comment about return value.
(cpp_errors, CPP_DL_EXTRACT, CPP_DL_WARNING_P): Remove.
(CPP_DL_NOTE): Define.
* include/line-map.h (linemap_print_containing_files): Remove.
* init.c (cpp_finish): Do not check for or return number of
errors.
* internal.h (cpp_reader): Remove errors field.
* line-map.c (linemap_print_containing_files): Remove.
* macro.c (_cpp_create_definition): Use CPP_DL_NOTE for message
about previous definition. Only emit it if previous diagnostic
was emitted.
From-SVN: r145263
2009-03-30 00:56:07 +02:00
|
|
|
TAGS_SOURCES = $(libcpp_a_SOURCES) internal.h ucnid.h \
|
2008-04-16 23:10:37 +02:00
|
|
|
include/line-map.h include/symtab.h include/cpp-id-data.h \
|
|
|
|
|
include/cpplib.h include/mkdeps.h system.h
|
|
|
|
|
|
|
|
|
|
TAGS: $(TAGS_SOURCES)
|
|
|
|
|
cd $(srcdir) && etags $(TAGS_SOURCES)
|
2004-08-25 10:10:02 +02:00
|
|
|
|
2004-05-24 12:50:45 +02:00
|
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
|
|
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
|
|
|
|
.NOEXPORT:
|
2004-08-25 10:10:02 +02:00
|
|
|
|
|
|
|
|
# Dependencies
|
re PR preprocessor/34695 (Preprocessor warning->error conversion from -Werror is silent)
PR preprocessor/34695
gcc:
* Makefile.in (c-opts.o): Depend on c-tree.h.
* c-common.c: Move down include of diagnostic.h.
(done_lexing, c_cpp_error): New.
* c-common.h (done_lexing): Declare.
* c-decl.c (c_write_global_declarations): Don't check cpp_errors
(parse_in).
* c-opts.c: Include c-tree.h.
(c_common_init_options): Set preprocessor error callback.
(c_common_handle_option): Do not set preprocessor
inhibit_warnings, warnings_are_errors, warn_system_headers,
pedantic_errors or inhibit_warnings flags.
(c_common_post_options): Do not check cpp_errors (parse_in).
(c_common_finish): Do not output dependencies if there were
errors. Do not check return value of cpp_finish.
* c-ppoutput.c (pp_file_change): Set input_location.
* c-tree.h (c_cpp_error): Declare.
* diagnostic.c (diagnostic_set_info_translated): Also initialize
override_column.
(diagnostic_build_prefix): Check override_column.
* diagnostic.h (diagnostic_info): Add override_column field.
(diagnostic_override_column): Define.
gcc/cp:
* cp-tree.h (cp_cpp_error): Remove.
* error.c (cp_cpp_error): Remove.
* parser.c (cp_lexer_new_main): Set done_lexing instead of
client_diagnostic and error callback.
gcc/fortran:
* cpp.c (cb_cpp_error): New.
(gfc_cpp_post_options): Don't set cpp_option->inhibit_warnings.
Don't check cpp_errors (cpp_in).
(gfc_cpp_init_0): Set cb->error.
gcc/testsuite:
* gcc.dg/builtin-redefine.c, gcc.dg/cpp/redef2.c,
gcc.dg/cpp/redef3.c, gcc.dg/cpp/trad/redef2.c: Use dg-message
instead of dg-warning for "previous definition" messages.
* gcc.dg/cpp/Wvariadic-1.c, gcc.dg/cpp/Wvariadic-3.c: Expect
"warnings being treated as errors" message.
* gcc.dg/fltconst-1.c: Use -fshow-column.
libcpp:
* makedepend.c: Remove.
* Makefile.in (makedepend_OBJS, makedepend$(EXEEXT)): Remove.
(all, clean, TAGS_SOURCES, include): Remove makedepend handling.
* directives.c (cpp_errors): Remove.
* errors.c (print_location, _cpp_begin_message, v_message):
Remove.
(cpp_error, cpp_error_with_line): Always use error callback.
(cpp_error, cpp_error_with_line, cpp_errno): Return bool.
* include/cpplib.h (cpp_options): Remove pedantic_errors,
inhibit_warnings, warn_system_headers, inhibit_errors,
warnings_are_errors, client_diagnostic.
(cpp_callbacks): Add extra arguments to error callback; make it
return bool.
(cpp_finish): Return void.
(cpp_destroy): Remove inaccurate comment about return value.
(cpp_errors, CPP_DL_EXTRACT, CPP_DL_WARNING_P): Remove.
(CPP_DL_NOTE): Define.
* include/line-map.h (linemap_print_containing_files): Remove.
* init.c (cpp_finish): Do not check for or return number of
errors.
* internal.h (cpp_reader): Remove errors field.
* line-map.c (linemap_print_containing_files): Remove.
* macro.c (_cpp_create_definition): Use CPP_DL_NOTE for message
about previous definition. Only emit it if previous diagnostic
was emitted.
From-SVN: r145263
2009-03-30 00:56:07 +02:00
|
|
|
-include $(patsubst %.o, $(DEPDIR)/%.Po, $(libcpp_a_OBJS))
|
2004-08-25 10:10:02 +02:00
|
|
|
|
2005-06-13 10:26:05 +02:00
|
|
|
# Dependencies on generated headers have to be explicit.
|
|
|
|
|
init.o: localedir.h
|