Skip to content

R
riscv-gcc-1
Commit 078e3ffe by Paolo Bonzini
Options

configure.ac: Replace Automake macro invocations with manual Autoconf checks and substitutions. 

libcpp/ChangeLog:
2004-08-25  Paolo Bonzini  <bonzini@gnu.org>

	* configure.ac: Replace Automake macro invocations
	with manual Autoconf checks and substitutions.
	* Makefile.am: Removed.
	* Makefile.in: Heavy simplification and reorganization.

gcc/ChangeLog:
2004-08-25  Paolo Bonzini  <bonzini@gnu.org>

	* doc/invoke.texi: Document that libcpp does not require
	Automake any longer.  Document that Automake 1.9.1 should
	work everywhere.

From-SVN: r86541
parent f8ca7e49
Showing with 56 additions and 96 deletions
gcc/ChangeLog
2004-08-25 Paolo Bonzini <bonzini@gnu.org>
* doc/invoke.texi: Document that libcpp does not require
Automake any longer. Document that Automake 1.9.1 should
work everywhere.
2004-08-25 Zack Weinberg <zack@codesourcery.com>
* flags.h (enum debug_info_type): Remove DWARF_DEBUG.
......
gcc/doc/install.texi
......@@ -320,12 +320,12 @@ associated @file{Makefile.in}.
Much of GCC does not use automake, so directly edit the @file{Makefile.in}
file. Specifically this applies to the @file{gcc}, @file{intl},
@file{libiberty}, @file{libobjc} directories as well as any
of their subdirectories.
@file{libcpp}, @file{libiberty}, @file{libobjc} directories as well
as any of their subdirectories.
The Java directory @file{libjava} requires a automake 1.9.1.
Every other directory requires automake 1.8.5.
The Java directory @file{libjava} requires automake 1.9.1. Every other
directory should work with either automake 1.8.5 and automake 1.9.1, but
most of them have been tested only with automake 1.8.5 so far.
@item gettext version 0.12 (or later)
......
libcpp/ChangeLog
2004-08-25 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Replace Automake macro invocations
with manual Autoconf checks and substitutions.
* configure: Regenerate.
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* Makefile.am: Removed.
* Makefile.in: Heavy simplification and reorganization.
2004-08-09 Mark Mitchell <mark@codesourcery.com>
* configure.ac (arm*-*-eabi*): New target.
......@@ -14,7 +24,7 @@
2004-07-23 Matthias Klose <doko@debian.org>
init.c (init_library): Use PACKAGE for the text domain.
* init.c (init_library): Use PACKAGE for the text domain.
2004-07-16 Andris Pavenis <pavenis@latnet.lv>
......
libcpp/Makefile.am deleted 100644 → 0
localedir = $(datadir)/locale
ACLOCAL_AMFLAGS = -I ../config
AM_CPPFLAGS = -I$(srcdir)/../include -I$(srcdir) @INCINTL@ \
-I$(srcdir)/include -DLOCALEDIR="\"$(localedir)\""
noinst_LIBRARIES = libcpp.a
libcpp_a_SOURCES = \
charset.c directives.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
noinst_HEADERS = \
include/cpplib.h include/line-map.h include/mkdeps.h \
include/symtab.h internal.h system.h ucnid.h
LIBINTL = @LIBINTL@
LIBICONV = @LIBICONV@
noinst_PROGRAMS = makedepend
makedepend_LDADD = libcpp.a ../libiberty/libiberty.a $(LIBINTL) $(LIBICONV)
XGETTEXT = @XGETTEXT@
GMSGFMT = @GMSGFMT@
MSGMERGE = msgmerge
CATALOGS = @CATALOGS@
all-local: build-po
if ENABLE_NLS
build-po: $(CATALOGS)
update-po: $(CATALOGS:.gmo=.pox)
else
build-po:
update-po:
endif
# N.B. We do not attempt to copy these into $(srcdir).
.po.gmo:
-test -d po || mkdir po
$(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:
-test -d po || mkdir po
$(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \
then echo po/$(PACKAGE).pot; \
else echo $(srcdir)/po/$(PACKAGE).pot; fi` -o $@
# This 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.
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)
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 $(mkinstalldirs) $(DESTDIR)$$dir; \
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
$(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
done
# Rule for regenerating the message template (gcc.pot).
# Instead of forcing everyone to edit POTFILES.in, which proved impractical,
# this rule has no dependencies and always regenerates libcpp.pot. This is
# relatively harmless since the .po files do not directly depend on it.
.PHONY: po/$(PACKAGE).pot
po/$(PACKAGE).pot: $(libcpp_a_SOURCES) $(noinst_HEADERS)
-test -d $(srcdir)/po || mkdir $(srcdir)/po
$(XGETTEXT) --default-domain=$(PACKAGE) \
--keyword=cpp_error,3 --keyword=cpp_errno,3 \
--keyword=cpp_error_with_line,5 \
--copyright-holder="Free Software Foundation, Inc." \
--msgid-bugs-address="http://gcc.gnu.org/bugs.html" \
--language=c -o po/$(PACKAGE).pot $^
libcpp/config.in
......@@ -129,7 +129,7 @@
/* Define as const if the declaration of iconv() needs const. */
#undef ICONV_CONST
/* Name of package */
/* Define to the name of this package. */
#undef PACKAGE
/* Define to the address where bug reports for this package should be sent. */
......@@ -173,9 +173,6 @@
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
/* Version number of package */
#undef VERSION
/* Define to empty if `const' does not conform to ANSI C. */
#undef const
......
libcpp/configure.ac
......@@ -5,13 +5,18 @@ AC_PREREQ(2.59)
AC_INIT(cpplib, [ ], gcc-bugs@gcc.gnu.org, cpplib)
AC_CONFIG_SRCDIR(ucnid.h)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(foreign)
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
AC_PROG_INSTALL
# Checks for programs.
AC_PROG_CC
AC_PROG_RANLIB
MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
AC_CHECK_PROGS([ACLOCAL], [aclocal], [$MISSING aclocal])
AC_CHECK_PROGS([AUTOCONF], [autoconf], [$MISSING autoconf])
AC_CHECK_PROGS([AUTOHEADER], [autoheader], [$MISSING autoheader])
# Checks for header files.
AC_HEADER_TIME
ACX_HEADER_STRING
......@@ -52,7 +57,29 @@ if test $ac_cv_type_uchar = yes; then
fi
AM_ICONV
AM_CONDITIONAL(ENABLE_NLS, [test "x$enable_nls" != xno])
# More defines and substitutions.
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define to the name of this package.])
AC_SUBST(PACKAGE)
if test "x$enable_nls" != xno; then
USED_CATALOGS='$(CATALOGS)'
else
USED_CATALOGS=
fi
AC_SUBST(USED_CATALOGS)
AC_ARG_ENABLE(maintainer-mode,
[ --enable-maintainer-mode enable rules only needed by maintainers],,
enable_maintainer_mode=no)
if test "x$enable_maintainer_mode" = xno; then
MAINT='#'
else
MAINT=
fi
AC_SUBST(MAINT)
AC_ARG_ENABLE(checking,
[ --enable-checking enable expensive run-time checks],,
enable_checking=no)
......@@ -94,6 +121,8 @@ AC_DEFINE_UNQUOTED(HOST_WIDE_INT, $host_wide_int,
[Define to the widest efficient host integer type at least
as wide as the target's size_t type.])
AC_CONFIG_HEADERS(config.h:config.in)
# Output.
AC_CONFIG_HEADERS(config.h:config.in, [echo timestamp > stamp-h1])
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment