X-Git-Url: http://ncurses.scripts.mit.edu/?a=blobdiff_plain;f=Ada95%2Fgen%2FMakefile.in;h=c900217c725c0f2ed50fcf00bd997cb0a78898fe;hb=fe7c48d7d5115212f09b4ec0d84b189a76953f0d;hp=f64c0f93690fa4dc0f3e5f18d57cc8dff0a154ca;hpb=34d602f272c394e9a980438e636e1ce4d355f83b;p=ncurses.git

diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index f64c0f93..c900217c 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2012,2014 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2014,2015 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,7 +28,7 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.80 2014/05/24 21:31:05 tom Exp $
+#  $Id: Makefile.in,v 1.83 2015/04/26 15:49:35 tom Exp $
 #
 .SUFFIXES:
 
@@ -55,12 +55,15 @@ LN_S		= @LN_S@
 
 CC		= @CC@
 HOST_CC		= @BUILD_CC@
+
 CFLAGS		= @CFLAGS@
+HOST_CFLAGS	= @BUILD_CFLAGS@
 
-CPPFLAGS	= @ACPPFLAGS@ @CPPFLAGS@ \
+CPPFLAGS	= @CPPFLAGS@
+HOST_CPPFLAGS	= @ACPPFLAGS@ @BUILD_CPPFLAGS@ \
 		  -DHAVE_CONFIG_H -I$(srcdir)
 
-CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
+CCFLAGS		= $(HOST_CPPFLAGS) $(HOST_CFLAGS)
 CFLAGS_NORMAL	= $(CCFLAGS)
 CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
 CFLAGS_PROFILE	= $(CCFLAGS) -pg
@@ -73,14 +76,19 @@ ABI_VERSION	= @cf_cv_abi_version@
 LOCAL_LIBDIR	= @top_builddir@/lib
 
 LINK		= $(HOST_CC)
-LD_FLAGS	= @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
+
+LDFLAGS		= @LDFLAGS@
+HOST_LDFLAGS	= @BUILD_LDFLAGS@
+
+LIBS		= @LIBS@
+HOST_LIBS	= @BUILD_LIBS@
 
 RANLIB		= @RANLIB@
 
 M4		= m4
 M4FLAGS		= -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
 
-ADACURSES_CONFIG = adacurses@DFT_ARG_SUFFIX@-config
+ADACURSES_CONFIG = adacurses@USE_CFG_SUFFIX@-config
 
 WRAPPER		= @NCURSES_SHLIB2@
 
@@ -147,7 +155,7 @@ uninstall.libs ::
 	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 $(PROG_GENERATE):  gen.o
-	@ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
+	@ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(HOST_LDFLAGS) $(HOST_LIBS) -o $@
 
 gen.o:	$(srcdir)/gen.c
 	$(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
@@ -297,7 +305,8 @@ adahtml:
 	@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` ;\