mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-01-09 22:35:09 +08:00
a6863e2538
2000-10-10 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * Makefile.am (LIBSUPCXX_INCLUDES): Adjust. * libsupc++/include: Remove * libsupc++/include/*: Move to ... * libsupc++: Here. * libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers. (glibcppinstalldir): New. * src/Makefile.am (c_base_headers): New. (c_shadow_headers): New (c_headers): New. (myinstallheaders): Correct install issues. * src/Makefile.in: Regenerate. * Makefile.am (CSHADOW_INCLUDES): Simplify. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir. * aclocal.m4: Regenerate. * mkcheck.in (SRC_DIR): Use it. * include/bits/std_stdexcept.h: And here. * include/bits/std_ios.h: Change std_exception.h to exception. * src/locale.cc: And here. * src/locale-inst.cc: And here. * include/bits/valarray_array.h: And here. * include/bits/stl_alloc.h: And here. * include/bits/stl_algobase.h: And here. * include/bits/pthread_allocimpl.h: And here. * include/bits/stl_construct.h: Change to std_new.h to new. * include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo. * src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES. (headers): Remove duplicated headers. (std_headers): And here. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove. * libsupc++/Makefile.in: Regenerate. * Makefile.am (LIBSUPCXX_INCLUDES): Add here. (AM_MAKEFLAGS): And here. * Makefile.in: Regenerate. * include/bits/std_typeinfo.h: Remove. * include/bits/std_new.h: Remove * include/bits/std_exception.h: Remove. * std/new: Remove. * std/typeinfo: Remove. * std/exception: Remove. * libio/_G_config.h (__need_ptrdiff_t): Add. * libsupc++/include/new: Change stddef.h to cstddef. * libsupc++/tinfo.h: Change limits.h to climits. * libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this renders the file uncompilable. Add copyright. * include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std namespace, as it is a fundamental type. From-SVN: r36833
113 lines
3.5 KiB
Makefile
113 lines
3.5 KiB
Makefile
## Makefile for the GNU C++ Support library.
|
|
##
|
|
## Copyright (C) 2000 Free Software Foundation, Inc.
|
|
##
|
|
## Process this file with automake to produce Makefile.in.
|
|
##
|
|
## This file is part of GNU CC.
|
|
##
|
|
## GNU CC is free software; you can redistribute it and/or modify
|
|
## it under the terms of the GNU General Public License as published by
|
|
## the Free Software Foundation; either version 2, or (at your option)
|
|
## any later version.
|
|
##
|
|
## GNU CC 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.
|
|
##
|
|
## You should have received a copy of the GNU General Public License
|
|
## along with GNU CC; see the file COPYING. If not, write to
|
|
## the Free Software Foundation, 59 Temple Place - Suite 330,
|
|
## Boston, MA 02111-1307, USA.
|
|
|
|
AUTOMAKE_OPTIONS = 1.3 cygnus
|
|
MAINT_CHARSET = latin1
|
|
|
|
# Cross compiler and multilib support.
|
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
|
if USE_LIBDIR
|
|
toolexeclibdir = $(libdir)$(MULTISUBDIR)
|
|
else
|
|
toolexecdir = $(exec_prefix)/$(target_alias)
|
|
toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR)
|
|
endif
|
|
|
|
|
|
# Need this library to both be part of libstdc++.a, and installed
|
|
# separately too.
|
|
# 1) separate libsupc++.la
|
|
toolexeclib_LTLIBRARIES = libsupc++.la
|
|
# 2) integrated libsupc++convenience.la that is to be a part of libstdc++.a
|
|
noinst_LTLIBRARIES = libsupc++convenience.la
|
|
|
|
|
|
INCLUDES = \
|
|
-I$(top_srcdir)/../gcc -I$(top_srcdir)/../include \
|
|
$(CSHADOW_INCLUDES) $(LIBSUPCXX_INCLUDES) -I$(GLIBCPP_INCLUDE_DIR) \
|
|
$(CONFIG_INCLUDES) -I$(top_builddir)
|
|
|
|
headers = \
|
|
cxxabi.h exception new new.h typeinfo
|
|
|
|
sources = \
|
|
del_op.cc \
|
|
del_opnt.cc \
|
|
del_opv.cc \
|
|
del_opvnt.cc \
|
|
exception.cc \
|
|
new_handler.cc \
|
|
new_op.cc \
|
|
new_opnt.cc \
|
|
new_opv.cc \
|
|
new_opvnt.cc \
|
|
pure.cc \
|
|
tinfo.cc \
|
|
tinfo2.cc \
|
|
vec.cc
|
|
|
|
libsupc___la_SOURCES = $(sources)
|
|
libsupc__convenience_la_SOURCES = $(sources)
|
|
|
|
# This insanely simple bit of install magic courtesy of Mr. Tromey.
|
|
glibcppinstalldir= $(prefix)/include/g++-v3
|
|
glibcppinstall_HEADERS = $(headers)
|
|
|
|
# Flags to force separate libtool library to be static only.
|
|
LIBTOOL = @LIBTOOL@ --tag disable-shared
|
|
LIBSUPCXX_CXXFLAGS = -prefer-pic
|
|
|
|
# AM_CXXFLAGS needs to be in each subdirectory so that it can be
|
|
# modified in a per-library or per-sub-library way.
|
|
# Need to manually set this option because CONFIG_CXXFLAGS has to be at
|
|
# the end of the compile line so that -O2 can be overridden as the
|
|
# occasion call for it. (ie, --enable-debug)
|
|
AM_CXXFLAGS = \
|
|
-fno-implicit-templates \
|
|
$(LIBSUPCXX_CXXFLAGS) \
|
|
$(WARN_CXXFLAGS) \
|
|
$(OPTIMIZE_CXXFLAGS) \
|
|
$(CONFIG_CXXFLAGS)
|
|
|
|
# Need to explicitly set this so that AM_CXXFLAGS is last. In
|
|
# addition, we don't use $(DEFS), which tries to set $(top_srcdir) as
|
|
# an include diretory, which screws up shadow headers. (That way,
|
|
# things like -O2 passed down from the toplevel can be overridden by
|
|
# --enable-debug.)
|
|
CXXCOMPILE = $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
|
|
$(CXXFLAGS) $(AM_CXXFLAGS)
|
|
|
|
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(INCLUDES) \
|
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(AM_CXXFLAGS)
|
|
|
|
# We have a problem when building the shared libstdc++ object if the
|
|
# rules automake generates would be used. We cannot allow CXX to be used
|
|
# in libtool since this would add -lstdc++ to the link line which of
|
|
# course is impossible.
|
|
CXXLINK = $(LIBTOOL) --mode=link "$(CC)" @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@
|
|
|
|
|
|
|
|
|
|
|