X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libada%2FMakefile.in;h=6133b175e294e97ae21e94f60b572a3bd1b72914;hb=55d7e60b069ce28f1a85c46045d57b917ae0ddea;hp=e77f9cd958f8cc07655edbde011e5858e22ab3fe;hpb=7a5d547a81aaaf9e10269fa226edcd14663ec907;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libada/Makefile.in b/libada/Makefile.in index e77f9cd958f..6133b175e29 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -16,7 +16,7 @@ # 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@ @@ -24,23 +24,16 @@ srcdir = @srcdir@ build = @build@ target = @target@ prefix = @prefix@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ # Nonstandard autoconf-set variables. enable_shared = @enable_shared@ LN_S=@LN_S@ -target_noncanonical=@target_noncanonical@ # Variables for the user (or the top level) to override. objext=.o GNATLIBFLAGS= -W -Wall -gnatpg THREAD_KIND=native TRACE=no -GNATLIBLDFLAGS= -ADA_FOR_BUILD= -ADA_FOR_TARGET= LDFLAGS= STAGE_PREFIX= @@ -55,17 +48,10 @@ T_ADA_CFLAGS= X_ADA_CFLAGS=@x_ada_cflags@ ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) -# Variables for gnattools. -ADAFLAGS= -gnatpg -gnata -ADA_INCLUDE_DIR = $(libsubdir)/adainclude -ADA_RTL_OBJ_DIR = $(libsubdir)/adalib - # For finding the GCC build dir, which is used far too much -GCC_DIR=../../gcc +GCC_DIR=../../$(HOST_SUBDIR)/gcc # Include fragment generated by GCC configure. include $(GCC_DIR)/libada-mk -# Variables based on those gleaned from the GCC makefile. :-P -libsubdir=$(libdir)/gcc/$(target_noncanonical)/$(gcc_version) TARGET_LIBGCC2_CFLAGS= GNATLIBCFLAGS= -g -O2 @@ -79,12 +65,6 @@ ifneq ($(tmake_file),) include $(tmake_file) endif -# Get possible host-specific override for libsubdir (ick). -xmake_file=$(subst /config,/../gcc/config,$(gcc_xmake_file)) -ifneq ($(xmake_file),) -include $(xmake_file) -endif - FLAGS_TO_PASS = \ "MAKEOVERRIDES=" \ "LDFLAGS=$(LDFLAGS)" \ @@ -94,139 +74,35 @@ FLAGS_TO_PASS = \ "objext=$(objext)" \ "prefix=$(prefix)" \ "STAGE_PREFIX=$(STAGE_PREFIX)" \ - "CC=$(cc_set_by_configure)" \ + "CC=$(host_cc_for_libada)" \ + "GCC_FOR_TARGET=$(CC)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" -ADA_FLAGS_TO_PASS = \ - "ADA_FOR_BUILD=$(ADA_FOR_BUILD)" \ - "ADA_INCLUDE_DIR=$(ADA_INCLUDE_DIR)" \ - "ADA_RTL_OBJ_DIR=$(ADA_RTL_OBJ_DIR)" \ - "ADAFLAGS=$(ADAFLAGS)" \ - "ADA_FOR_TARGET=$(ADA_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ - "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" - -ADA_TOOLS_FLAGS_TO_PASS=\ - "CC=../../xgcc -B../../" \ - "CFLAGS=$(CFLAGS)" \ - "exeext=$(exeext)" \ - "ADAFLAGS=$(ADAFLAGS)" \ - "ADA_INCLUDES=-I../rts" \ - "GNATMAKE=../../gnatmake" \ - "GNATLINK=../../gnatlink" \ - "GNATBIND=../../gnatbind" - # Rules to build gnatlib. .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared gnatlib: @default_gnatlib_target@ -gnatlib-plain: +gnatlib-plain: $(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 + gnatlib \ + && touch stamp-libada -gnatlib-sjlj gnatlib-zcx gnatlib-shared: +gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(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)" \ - $@ - -.PHONY: rts-zfp rts-ravenscar -rts-zfp rts-ravenscar: - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ - GNATMAKE=../gnatmake-cross \ - $@ - -# Rules to build gnattools. -.PHONY: gnattools gnattools-native gnattools-cross regnattools -gnattools: @default_gnattools_target@ - -gnattools-native: gnatlib - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ - ADA_INCLUDES="-I- -I../rts" \ - CC="../../xgcc -B../../" STAGE_PREFIX=../../ gnattools1 - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2 - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools3 - -# For cross builds of gnattools, -# put the host RTS dir first in the PATH to hide the default runtime -# files that are among the sources -# FIXME: This should be done in configure. -RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) -gnattools-cross: gnatlib - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) \ - ADA_INCLUDES="-I$(RTS_DIR)../adainclude -I$(RTS_DIR)" \ - GNATMAKE="gnatmake" \ - GNATBIND="gnatbind" \ - GNATLINK="gnatlink" \ - LIBGNAT="" \ - gnattools1-re gnattools2 gnattools4 - # Rename cross tools to where the GCC makefile wants them when - # installing. FIXME: installation should be done elsewhere. - if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatbl$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatbl$(exeext) $(GCC_DIR)/gnatbl-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \ - mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \ - mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gpr2make$(exeext) ] ; then \ - mv $(GCC_DIR)/gpr2make$(exeext) $(GCC_DIR)/gpr2make-cross$(exeext); \ - fi - if [ -f $(GCC_DIR)/gprcmd$(exeext) ] ; then \ - mv $(GCC_DIR)/gprcmd$(exeext) $(GCC_DIR)/gprcmd-cross$(exeext); \ - fi - -regnattools: - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools1-re - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools2 - $(MAKE) -C $(GCC_DIR)/ada $(ADA_TOOLS_FLAGS_TO_PASS) gnattools3 + $@ \ + && touch stamp-libada # Check uninstalled version. check: @@ -240,6 +116,9 @@ info: # Build DVI (none here). dvi: +# Build html (none here). +html: + # Build TAGS (none here). TAGS: @@ -248,6 +127,8 @@ install: install-info: +install-html: + # Cleaning rules. mostlyclean: @@ -269,3 +150,7 @@ config.status: $(srcdir)/configure $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac cd $(srcdir) && autoconf + +# Don't export variables to the environment, in order to not confuse +# configure. +.NOEXPORT: