ncurses 5.9 - patch 20121026

[ncurses.git] / Ada95 / gen / Makefile.in

diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 5dda13154dcb595dee0475dfbbc7b12f84fd07d5..302ad94f4424548bf9b267019b5a27197430cc17 100644 (file)
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -28,14 +28,15 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.68 2010/07/17 19:56:15 tom Exp $
+#  $Id: Makefile.in,v 1.77 2012/10/06 18:58:48 tom Exp $
 #
 .SUFFIXES:
 
 SHELL          = /bin/sh
+VPATH          = @srcdir@
 THIS           = Makefile
 
-x              = @PROG_EXT@
+x              = @EXEEXT@
 
 top_srcdir     = @top_srcdir@
 DESTDIR                = @DESTDIR@
@@ -56,7 +57,7 @@ CC            = @CC@
 HOST_CC                = @BUILD_CC@
 CFLAGS         = @CFLAGS@
 
-CPPFLAGS       = @ACPPFLAGS@ \
+CPPFLAGS       = @ACPPFLAGS@ @CPPFLAGS@ \
                  -DHAVE_CONFIG_H -I$(srcdir)
 
 CCFLAGS                = $(CPPFLAGS) $(CFLAGS)
@@ -72,7 +73,7 @@ ABI_VERSION   = @cf_cv_abi_version@
 LOCAL_LIBDIR   = @top_builddir@/lib
 
 LINK           = $(HOST_CC)
-LD_FLAGS       = @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@
+LD_FLAGS       = @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
 
 RANLIB         = @RANLIB@
 
@@ -87,7 +88,7 @@ PROG_GENERATE = ./generate$x
 GENERATE       = $(PROG_GENERATE) '@DFT_ARG_SUFFIX@'
 DEL_ADAMODE    = sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d'
 
-GNATHTML       = `type -p gnathtml || type -p gnathtml.pl`
+GNATHTML       = `type -p gnathtml || type -p gnathtml.pl 2>/dev/null`
 GNATHP          = www.gnat.com
 
 ################################################################################
@@ -178,7 +179,7 @@ uninstall.libs ::
        -rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 $(PROG_GENERATE):  gen.o
-       @ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
+       @ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
 
 gen.o: $(srcdir)/gen.c
        $(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
@@ -304,6 +305,7 @@ $(ADA_SRCDIR)/$(ABASE)-mouse.ads: $(srcdir)/$(ABASE)-mouse.ads.m4 \
        $(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-panels.ads: $(srcdir)/$(ABASE)-panels.ads.m4 \
+                                  $(GEN_FILES4) \
                                   $(srcdir)/normal.m4
        $(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
        $(srcdir)/$(ABASE)-panels.ads.m4 |\
@@ -376,7 +378,7 @@ distclean :: clean
 
 realclean :: distclean
 
-HTML_DIR = ../../doc/html/ada
+HTML_DIR = @ADAHTML_DIR@
 
 instab.tmp : table.m4 $(GEN_SRC)
        @rm -f $@
@@ -404,10 +406,12 @@ $(HTML_DIR)/table.html : instab.tmp
        @rm -f instab.tmp
 
 adahtml:
+       test -n "$(GNATHTML)" || exit 1
        @find $(HTML_DIR) -type f -exec rm -f {} \;
        @mkdir -p $(HTML_DIR)
        cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
-       ln -sf ../src/*.ali .
+@USE_OLD_MAKERULES@    ln -sf ../src/*.ali .
+@USE_GNAT_PROJECTS@    ln -sf ../static-ali/*.ali .
        @echo "Filtering generated files"
        @for f in $(GEN_SRC); do \
           h=`basename $$f` ;\