diff options
Diffstat (limited to 'gcc/ada/Makefile.in')
| -rw-r--r-- | gcc/ada/Makefile.in | 83 |
1 files changed, 51 insertions, 32 deletions
diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index e4e6bb2e508..f7105529cf6 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -115,7 +115,7 @@ RANLIB = ranlib # Test to use to see whether ranlib exists on the system. RANLIB_TEST = [ -f /usr/bin/ranlib -o -f /bin/ranlib ] SHELL = @SHELL@ -PWD = $${PWDCMD-pwd} +PWD_COMMAND = $${PWDCMD-pwd} # How to copy preserving the date INSTALL_DATA_DATE = cp -p MAKEINFO = makeinfo @@ -187,10 +187,10 @@ host_canonical=@host_canonical@ srcdir = @srcdir@ VPATH = @srcdir@ -fsrcdir := $(shell cd $(srcdir);${PWD}) -fsrcpfx := $(shell cd $(srcdir);${PWD})/ -fcurdir := $(shell ${PWD}) -fcurpfx := $(shell ${PWD})/ +fsrcdir := $(shell cd $(srcdir);${PWD_COMMAND}) +fsrcpfx := $(shell cd $(srcdir);${PWD_COMMAND})/ +fcurdir := $(shell ${PWD_COMMAND}) +fcurpfx := $(shell ${PWD_COMMAND})/ # Top build directory, relative to here. top_builddir = .. @@ -750,7 +750,25 @@ ifeq ($(strip $(filter-out mips sgi irix%,$(targ))),) LIBRARY_VERSION := $(strip $(shell grep Library_Version $(fsrcpfx)gnatvsn.ads | sed -e 's/.*GNAT Lib v\(.*\)[ "].*/\1/')) endif -ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),) +ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),) + LIBGNAT_TARGET_PAIRS = \ + a-excpol.adb<4wexcpol.adb \ + a-intnam.ads<4hintnam.ads \ + s-inmaop.adb<7sinmaop.adb \ + s-interr.adb<5ginterr.adb \ + s-intman.adb<7sintman.adb \ + s-osinte.adb<5hosinte.adb \ + s-osinte.ads<5hosinte.ads \ + s-parame.ads<5hparame.ads \ + s-osprim.adb<7sosprim.adb \ + s-taprop.adb<5htaprop.adb \ + s-taspri.ads<5htaspri.ads \ + s-tpopsp.adb<7stpopsp.adb \ + g-soccon.ads<3hsoccon.ads \ + system.ads<5hsystem.ads +endif + +ifeq ($(strip $(filter-out hppa% hp hpux11%,$(targ))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<4hintnam.ads \ s-inmaop.adb<7sinmaop.adb \ @@ -766,7 +784,7 @@ ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),) g-soccon.ads<3hsoccon.ads \ system.ads<5hsystem.ads - TGT_LIB = /usr/lib/libcl.a -lpthread + TGT_LIB = /usr/lib/libcl.a THREADSLIB = -lpthread -lc_r SYMLIB = -laddr2line -lbfd $(INTLLIBS) soext = .sl @@ -789,6 +807,7 @@ ifeq ($(strip $(filter-out hppa% hp hpux%,$(targ))),) g-soccon.ads<3hsoccon.ads \ system.ads<5hsystem.ads + TGT_LIB = THREADSLIB = -lcma endif endif @@ -875,7 +894,7 @@ ifeq ($(strip $(filter-out lynxos,$(osys))),) endif endif -ifeq ($(strip $(filter-out rtems,$(osys))),) +ifeq ($(strip $(filter-out rtems rtemself rtemsaout rtemscoff,$(osys))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<4rintnam.ads \ s-inmaop.adb<7sinmaop.adb \ @@ -886,7 +905,7 @@ ifeq ($(strip $(filter-out rtems,$(osys))),) s-parame.adb<5rparame.adb \ s-taprop.adb<7staprop.adb \ s-taspri.ads<7staspri.ads \ - s-tpopsp.adb<5atpopsp.adb + s-tpopsp.adb<5rtpopsp.adb endif ifeq ($(strip $(filter-out go32 msdos,$(osys))),) @@ -1021,10 +1040,10 @@ endif LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \ errno.c exit.c cal.c \ raise.h raise.c sysdep.c types.h aux-io.c init.c \ - final.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) + adafinal.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o errno.o exit.o \ - raise.o sysdep.o aux-io.o init.o cal.o final.o \ + raise.o sysdep.o aux-io.o init.o cal.o adafinal.o \ tracebak.o expect.o mkdir.o $(EXTRA_LIBGNAT_OBJS) # NOTE ??? - when the -I option for compiling Ada code is made to work, @@ -1711,38 +1730,38 @@ install-gnatlib: ../stamp-gnatlib # Create the directory before deleting it, in case the directory is # a list of directories (as it may be on VMS). This ensures we are # deleting the right one. - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - $(RMDIR) $(ADA_RTL_OBJ_DIR) - $(RMDIR) $(ADA_INCLUDE_DIR) - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - -$(INSTALL_DATA) ada/rts/Makefile.adalib $(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(INSTALL_DATA) ada/rts/Makefile.adalib $(DESTDIR)$(ADA_RTL_OBJ_DIR) for file in ada/rts/*.ali; do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done -for file in ada/rts/*$(arext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),) -for file in ada/rts/lib*$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done else -for file in ada/rts/lib*-**$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done endif - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnat-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnat$(soext) - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnarl-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnarl$(soext) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnat-*$(soext) libgnat$(soext) ) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnarl-*$(soext) libgnarl$(soext) ) # This copy must be done preserving the date on the original file. for file in ada/rts/*.adb ada/rts/*.ads; do \ - $(INSTALL_DATA_DATE) $$file $(ADA_INCLUDE_DIR); \ + $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \ done - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads ../stamp-gnatlib2: $(RM) rts/s-*.ali @@ -1854,7 +1873,7 @@ prepare-rts: endif install-rts: force - $(CP) -r rts-$(RTS_NAME) $(libsubdir)/ + $(CP) -r rts-$(RTS_NAME) $(DESTDIR)$(libsubdir)/ rts-none: force $(MAKE) $(FLAGS_TO_PASS) prepare-rts \ @@ -2088,7 +2107,7 @@ deftarg.o : deftarg.c errno.o : errno.c exit.o : raise.h exit.c expect.o : expect.c -final.o : raise.h final.c +adafinal.o : raise.h adafinal.c gmem.o : gmem.c link.o : link.c mkdir.o : mkdir.c @@ -2131,7 +2150,7 @@ force: # Gnatlbr is only used on VMS -GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o final.o init.o \ +GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o adafinal.o init.o \ raise.o sysdep.o tracebak.o GNATLBR_C_OBJS = $(GNATLBR_RTL_C_OBJS) |