X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libada%2FMakefile.in;h=01759f36881f5d745a2d6cf198ae2d16b2586f7b;hp=4300765a3bde36dbd60eedc48ba904a04e668eb9;hb=55947387f5f345bdcd46338fb969549bf46d9f22;hpb=8e31204be43d251dd6ca6d769a116811f4b8ae73;ds=sidebyside

diff --git a/libada/Makefile.in b/libada/Makefile.in
index 4300765a3bd..01759f36881 100644
--- a/libada/Makefile.in
+++ b/libada/Makefile.in
@@ -16,39 +16,86 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 # Default target; must be first.
-all: gnatlib gnattools
+all: gnatlib
 
 # Standard autoconf-set variables.
 SHELL = @SHELL@
 srcdir = @srcdir@
+libdir = @libdir@
 build = @build@
 target = @target@
-enable_shared = @enable_shared@
+prefix = @prefix@
 
 # Nonstandard autoconf-set variables.
-
-FLAGS_TO_PASS =
-
-GNATLIB = gnatlib
-
-ifeq ($(build),$(target))
-  GNATTOOLS = gnattools
-
-  ifeq ($(enable_shared),yes)
-    GNATLIB = gnatlib-shared
-  endif
-
-else
-  GNATTOOLS = cross-gnattools ada.all.cross
-endif
+enable_shared = @enable_shared@
+LN_S=@LN_S@
+
+# Variables for the user (or the top level) to override.
+objext=.o
+GNATLIBFLAGS= -W -Wall -gnatpg
+THREAD_KIND=native
+TRACE=no
+LDFLAGS=
+
+# The tedious process of getting CFLAGS right.
+CFLAGS=-g
+LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
+GCC_WARN_CFLAGS = $(LOOSE_WARN)
+WARN_CFLAGS = @warn_cflags@
+
+TARGET_LIBGCC2_CFLAGS=
+GNATLIBCFLAGS= -g -O2
+
+# Get target-specific overrides for TARGET_LIBGCC2_CFLAGS.
+host_subdir = @host_subdir@
+GCC_DIR=../../$(host_subdir)/gcc
+include $(GCC_DIR)/libgcc.mvars
+
+# exeext should not be used because it's the *host* exeext.  We're building
+# a *target* library, aren't we?!?  Likewise for CC.  Still, provide bogus
+# definitions just in case something slips through the safety net provided
+# by recursive make invocations in gcc/ada/Makefile.in
+FLAGS_TO_PASS = \
+        "MAKEOVERRIDES=" \
+        "LDFLAGS=$(LDFLAGS)" \
+        "LN_S=$(LN_S)" \
+        "SHELL=$(SHELL)" \
+        "objext=$(objext)" \
+        "prefix=$(prefix)" \
+        "exeext=.exeext.should.not.be.used " \
+	'CC=the.host.compiler.should.not.be.needed' \
+	"GCC_FOR_TARGET=$(CC)" \
+        "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)"
 
 # Rules to build gnatlib.
-gnatlib:
-	$(MAKE) -C ../../gcc $(FLAGS_TO_PASS) $(GNATLIB)
-
-# Rules to build gnattools.
-gnattools:
-	$(MAKE) -C ../../gcc $(FLAGS_TO_PASS) $(GNATTOOLS)
+.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons
+gnatlib: @default_gnatlib_target@
+
+gnatlib-plain: oscons $(GCC_DIR)/ada/Makefile
+	test -f stamp-libada || \
+	$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
+	  GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	  GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+	  TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
+	  THREAD_KIND="$(THREAD_KIND)" \
+	  TRACE="$(TRACE)" \
+	  gnatlib \
+	&& touch stamp-libada
+
+gnatlib-sjlj gnatlib-zcx gnatlib-shared: oscons $(GCC_DIR)/ada/Makefile
+	test -f stamp-libada || \
+	$(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \
+	  GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+	  GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+	  TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \
+	  THREAD_KIND="$(THREAD_KIND)" \
+	  TRACE="$(TRACE)" \
+	  $@ \
+	&& touch stamp-libada
+
+oscons:
+	$(MAKE) -C $(GCC_DIR) THREAD_KIND="$(THREAD_KIND)" \
+	  $(FLAGS_TO_PASS) ada/s-oscons.ads
 
 # Check uninstalled version.
 check:
@@ -62,6 +109,12 @@ info:
 # Build DVI (none here).
 dvi:
 
+# Build PDF (none here).
+pdf:
+
+# Build html (none here).
+html:
+
 # Build TAGS (none here).
 TAGS:
 
@@ -70,6 +123,10 @@ install:
 
 install-info:
 
+install-pdf:
+
+install-html:
+
 # Cleaning rules.
 mostlyclean:
 
@@ -89,5 +146,10 @@ Makefile: $(srcdir)/Makefile.in config.status
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in
+$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac \
+	$(srcdir)/../config/acx.m4 $(srcdir)/../config/override.m4
 	cd $(srcdir) && autoconf
+
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT: