diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index b7e3bec..48df318 100644
--- a/Ada95/gen/Makefile.in
+++ b/Ada95/gen/Makefile.in
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 1998-2007,2008 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,14 +28,15 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.61 2008/10/04 22:58:31 tom Exp $
+#  $Id: Makefile.in,v 1.85 2015/08/05 23:06:31 tom Exp $
 #
 .SUFFIXES:
 
-SHELL		= /bin/sh
+SHELL		= @SHELL@
+VPATH		= @srcdir@
 THIS		= Makefile
 
-x		= @PROG_EXT@
+x		= @EXEEXT@
 
 top_srcdir	= @top_srcdir@
 DESTDIR		= @DESTDIR@
@@ -43,9 +44,7 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-
-ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
-ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
+includedir	= @includedir@
 
 INSTALL		= @INSTALL@
 INSTALL_PROG	= @INSTALL_PROGRAM@
@@ -56,12 +55,15 @@
 
 CC		= @CC@
 HOST_CC		= @BUILD_CC@
-CFLAGS		= @CFLAGS@
 
-CPPFLAGS	= @ACPPFLAGS@ \
+CFLAGS		= @CFLAGS@
+HOST_CFLAGS	= @BUILD_CFLAGS@
+
+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
@@ -74,20 +76,32 @@
 LOCAL_LIBDIR	= @top_builddir@/lib
 
 LINK		= $(HOST_CC)
-LD_FLAGS	= @LD_MODEL@ $(LOCAL_LIBS) @LDFLAGS@ @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_ARGS2@
+LDFLAGS		= @LDFLAGS@
+LIBS		= @LIBS@
+
+# For the wide-character configuration combined with broken_linker, we need
+# addresses of ACS_xxx constants, which requires linking with the newly built
+# ncurses library.  If cross-compiling, the developer has to fill in a workable
+# native library for this purpose.
+NATIVE_LDFLAGS	= @LD_MODEL@ $(LOCAL_LIBS) @TINFO_LDFLAGS2@ $(LDFLAGS) @LIBS@ @LOCAL_LDFLAGS2@ $(LDFLAGS) @TINFO_LIBS@
+CROSS_LDFLAGS	= @BUILD_LDFLAGS@ @BUILD_LIBS@
+
+ACTUAL_LDFLAGS	= @ADAGEN_LDFLAGS@
 
 RANLIB		= @RANLIB@
 
 M4		= m4
 M4FLAGS		= -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
 
-ADACURSES_CONFIG = adacurses-config
+ADACURSES_CONFIG = adacurses@USE_CFG_SUFFIX@-config
 
-WRAPPER		= sh $(top_srcdir)/misc/shlib
-GENERATE	= ./gen$x '@DFT_ARG_SUFFIX@'
+WRAPPER		= @NCURSES_SHLIB2@
+
+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
 
 ################################################################################
@@ -96,39 +110,6 @@
 
 ADA_SRCDIR	= ../src
 
-GEN_FILES0      = Base_Defs
-
-GEN_FILES1      = ACS_Map                      		\
-		  AC_Rep                       		\
-		  Base_Defs			        \
-		  Character_Attribute_Set_Rep  		\
-		  Color_Defs                   		\
-		  Key_Definitions              		\
-		  Linker_Options               		\
-		  Old_Keys                     		\
-		  Public_Variables                      \
-		  Trace_Defs				\
-		  Version_Info				\
-		  Window_Offsets
-
-GEN_FILES2      = Menu_Opt_Rep        		    	\
-		  Menu_Base_Defs               		\
-		  Menu_Linker_Options          		\
-		  Item_Rep
-
-GEN_FILES3      = Form_Opt_Rep                 		\
-		  Form_Base_Defs               		\
-		  Form_Linker_Options          		\
-		  Field_Rep
-
-GEN_FILES4      = Mouse_Base_Defs              		\
-		  Mouse_Event_Rep			\
-		  Mouse_Events                          \
-		  Panel_Linker_Options
-
-GEN_FILES5	= Chtype_Def                            \
-		  Eti_Defs
-
 GEN_TARGETS     = $(ADA_SRCDIR)/$(ABASE).ads         			\
 		  $(ADA_SRCDIR)/$(ABASE).adb         			\
 	          $(ADA_SRCDIR)/$(ABASE)-aux.ads   			\
@@ -142,7 +123,8 @@
 	          $(ADA_SRCDIR)/$(ABASE)-forms-form_user_data.ads	\
 	          $(ADA_SRCDIR)/$(ABASE)-forms-field_types.ads		\
 	          $(ADA_SRCDIR)/$(ABASE)-forms-field_user_data.ads	\
-	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads
+	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads           \
+                  $(ADA_SRCDIR)/$(ABASE)_constants.ads
 
 GEN_SRC		= $(srcdir)/$(ABASE).ads.m4				\
 		  $(srcdir)/$(ABASE).adb.m4				\
@@ -166,166 +148,64 @@
 
 sources:
 
-$(ADA_INCLUDE) \
-$(ADA_OBJECTS) :
-	sh $(top_srcdir)/mkdirs.sh $@
+$(DESTDIR)$(bindir) :
+	mkdir -p $@
 
 install \
-install.libs :: $(ADA_INCLUDE)
-	@echo installing package $(ALIB) in $(ADA_INCLUDE)
-	@$(top_srcdir)/tar-copy.sh '$(ALIB)*.ad?' $(ADA_SRCDIR) $(ADA_INCLUDE)
-	@$(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ad?' $(ADA_SRCDIR) $(ADA_INCLUDE)
-	@test $(srcdir) != ./ && $(top_srcdir)/tar-copy.sh '$(ALIB)*.ad?' $(srcdir)/../src $(ADA_INCLUDE)
-	@test $(srcdir) != ./ && $(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ad?' $(srcdir)/../src $(ADA_INCLUDE)
-
-install \
-install.libs :: $(ADA_OBJECTS)
-	@echo installing package $(ALIB) in $(ADA_OBJECTS)
-	@-chmod a-wx $(ADA_SRCDIR)/*.ali
-	@$(top_srcdir)/tar-copy.sh '$(ALIB)*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
-	@$(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
-	@-chmod u+x $(ADA_SRCDIR)/*.ali
-
-install \
-install.libs :: $(DESTDIR)$(bindir) adacurses-config
-	$(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-
-uninstall \
-uninstall.libs ::
-	@echo removing package $(ALIB) from $(ADA_INCLUDE)
-	-@cd $(ADA_INCLUDE) && rm -f $(ALIB)[-.]*
-
-uninstall \
-uninstall.libs ::
-	@echo removing package $(ALIB) from $(ADA_OBJECTS)
-	-@cd $(ADA_OBJECTS) && rm -f $(ALIB)[-.]*
+install.libs :: $(DESTDIR)$(bindir) $(ADACURSES_CONFIG)
+	$(INSTALL_PROG) $(ADACURSES_CONFIG) $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
 uninstall \
 uninstall.libs ::
 	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
-gen$x:	gen.o
-	@ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
+$(PROG_GENERATE):  gen.o
+	@ECHO_LD@ $(LINK) $(CFLAGS_NORMAL) gen.o $(ACTUAL_LDFLAGS) -o $@
 
 gen.o:	$(srcdir)/gen.c
 	$(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
-################################################################################
-Character_Attribute_Set_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) B A" >$@
 
-Base_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) B B" >$@
-
-Color_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) B C" >$@
-
-Window_Offsets: gen$x
-	$(WRAPPER) "$(GENERATE) B D" >$@
-
-Key_Definitions: gen$x
-	$(WRAPPER) "$(GENERATE) B K" >$@
-
-Linker_Options: gen$x
-	$(WRAPPER) "$(GENERATE) B L" >$@
-
-ACS_Map: gen$x
-	$(WRAPPER) "$(GENERATE) B M" >$@
-
-Old_Keys: gen$x
-	$(WRAPPER) "$(GENERATE) B O" >$@
-
-Public_Variables: gen$x
-	$(WRAPPER) "$(GENERATE) B P" >$@
-
-AC_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) B R" >$@
-
-Version_Info: gen$x
-	$(WRAPPER) "$(GENERATE) B V" >$@
-
-Trace_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) B T" >$@
-################################################################################
-Menu_Opt_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) M R" >$@
-
-Menu_Base_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) M B" >$@
-
-Menu_Linker_Options: gen$x
-	$(WRAPPER) "$(GENERATE) M L" >$@
-
-Item_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) M I" >$@
-################################################################################
-Form_Opt_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) F R" >$@
-
-Form_Base_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) F B" >$@
-
-Form_Linker_Options: gen$x
-	$(WRAPPER) "$(GENERATE) F L" >$@
-
-Field_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) F I" >$@
-################################################################################
-Mouse_Base_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) P B" >$@
-
-Mouse_Event_Rep: gen$x
-	$(WRAPPER) "$(GENERATE) P M" >$@
-
-Mouse_Events: gen$x
-	$(WRAPPER) "$(GENERATE) B E" >$@
-
-Panel_Linker_Options: gen$x
-	$(WRAPPER) "$(GENERATE) P L" >$@
-
-Chtype_Def: gen$x
-	$(WRAPPER) "$(GENERATE) E C" >$@
-
-Eti_Defs: gen$x
-	$(WRAPPER) "$(GENERATE) E E" >$@
+$(ADA_SRCDIR)/$(ABASE)_constants.ads: $(PROG_GENERATE)
+	$(WRAPPER) "$(GENERATE)" >$@
 ################################################################################
 $(ADA_SRCDIR)/$(ABASE).ads: 	$(srcdir)/$(ABASE).ads.m4 \
-				$(GEN_FILES1) $(srcdir)/normal.m4
+				$(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE).ads.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE).adb: 	$(srcdir)/$(ABASE).adb.m4 \
-				$(GEN_FILES1) $(srcdir)/normal.m4
+				$(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE).adb.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-aux.ads: $(srcdir)/$(ABASE)-aux.ads.m4 \
-				$(GEN_FILES5) $(srcdir)/normal.m4
+				$(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE)-aux.ads.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-trace.ads: $(srcdir)/$(ABASE)-trace.ads.m4 \
-				$(GEN_FILES5) $(srcdir)/normal.m4
+				  $(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE)-trace.ads.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-menus.ads: $(srcdir)/$(ABASE)-menus.ads.m4 \
-				  $(GEN_FILES2) $(srcdir)/normal.m4
+				  $(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE)-menus.ads.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-forms.ads: $(srcdir)/$(ABASE)-forms.ads.m4 \
-				  $(GEN_FILES3) $(srcdir)/normal.m4
+				  $(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE)-forms.ads.m4 |\
 	$(DEL_ADAMODE) >$@
 
 $(ADA_SRCDIR)/$(ABASE)-mouse.ads: $(srcdir)/$(ABASE)-mouse.ads.m4 \
-				  $(GEN_FILES4) $(srcdir)/normal.m4
+				  $(srcdir)/normal.m4
 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
 	$(srcdir)/$(ABASE)-mouse.ads.m4 |\
 	$(DEL_ADAMODE) >$@
@@ -387,23 +267,18 @@
 @MAKE_UPPER_TAGS@	etags *.[ch]
 
 mostlyclean ::
-	-rm -f a.out core gen$x *.o
-	-rm -f $(GEN_FILES1)
-	-rm -f $(GEN_FILES2)
-	-rm -f $(GEN_FILES3)
-	-rm -f $(GEN_FILES4)
-	-rm -f $(GEN_FILES5)
+	-rm -f a.out core $(PROG_GENERATE) *.o
 
 clean :: mostlyclean
 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
 
 distclean :: clean
-	-rm -f adacurses-config
+	-rm -f $(ADACURSES_CONFIG)
 	-rm -f Makefile
 
 realclean :: distclean
 
-HTML_DIR = ../../doc/html/ada
+HTML_DIR = @ADAHTML_DIR@
 
 instab.tmp : table.m4 $(GEN_SRC)
 	@rm -f $@
@@ -431,10 +306,12 @@
 	@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` ;\