X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fgen%2FMakefile.in;h=10fd6352ce3c1a5ee6ad7ab8271e062517ea6ef3;hp=26a624328ba0fb1e78f5945de24e7beec159d153;hb=2b635f090ec43c82958cef9369464aee4dd8975f;hpb=4f10f7dff42e5348b814bdce71d3e4d925bd6ed6;ds=sidebyside

diff --git a/Ada95/gen/Makefile.in b/Ada95/gen/Makefile.in
index 26a62432..10fd6352 100644
--- 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-2010,2011 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,11 +28,12 @@
 #
 #  Author:  Juergen Pfeifer, 1996
 #
-#  $Id: Makefile.in,v 1.64 2010/02/21 01:48:47 tom Exp $
+#  $Id: Makefile.in,v 1.74 2011/03/26 23:36:30 tom Exp $
 #
 .SUFFIXES:
 
 SHELL		= /bin/sh
+VPATH		= @srcdir@
 THIS		= Makefile
 
 x		= @PROG_EXT@
@@ -45,9 +46,6 @@ exec_prefix	= @exec_prefix@
 bindir		= @bindir@
 includedir	= @includedir@
 
-ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
-ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
-
 INSTALL		= @INSTALL@
 INSTALL_PROG	= @INSTALL_PROGRAM@
 INSTALL_DATA	= @INSTALL_DATA@
@@ -59,7 +57,7 @@ CC		= @CC@
 HOST_CC		= @BUILD_CC@
 CFLAGS		= @CFLAGS@
 
-CPPFLAGS	= @ACPPFLAGS@ \
+CPPFLAGS	= @ACPPFLAGS@ @CPPFLAGS@ \
 		  -DHAVE_CONFIG_H -I$(srcdir)
 
 CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
@@ -84,11 +82,13 @@ M4FLAGS		= -DNCURSES_EXT_FUNCS=@NCURSES_EXT_FUNCS@
 
 ADACURSES_CONFIG = adacurses@DFT_ARG_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
 
 ################################################################################
@@ -167,127 +167,99 @@ libs :	$(GEN_TARGETS)
 
 sources:
 
-$(DESTDIR)$(bindir) \
-$(ADA_INCLUDE) \
-$(ADA_OBJECTS) :
-	sh $(top_srcdir)/mkdirs.sh $@
-
-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
+$(DESTDIR)$(bindir) :
+	mkdir -p $@
 
 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)[-.]*
-
 uninstall \
 uninstall.libs ::
 	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
 
-gen$x:	gen.o
+$(PROG_GENERATE):  gen.o
 	@ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
 
 gen.o:	$(srcdir)/gen.c
 	$(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
 ################################################################################
-Character_Attribute_Set_Rep: gen$x
+Character_Attribute_Set_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B A" >$@
 
-Base_Defs: gen$x
+Base_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B B" >$@
 
-Color_Defs: gen$x
+Color_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B C" >$@
 
-Window_Offsets: gen$x
+Window_Offsets: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B D" >$@
 
-Key_Definitions: gen$x
+Key_Definitions: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B K" >$@
 
-Linker_Options: gen$x
+Linker_Options: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B L" >$@
 
-ACS_Map: gen$x
+ACS_Map: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B M" >$@
 
-Old_Keys: gen$x
+Old_Keys: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B O" >$@
 
-Public_Variables: gen$x
+Public_Variables: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B P" >$@
 
-AC_Rep: gen$x
+AC_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B R" >$@
 
-Version_Info: gen$x
+Version_Info: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B V" >$@
 
-Trace_Defs: gen$x
+Trace_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B T" >$@
 ################################################################################
-Menu_Opt_Rep: gen$x
+Menu_Opt_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) M R" >$@
 
-Menu_Base_Defs: gen$x
+Menu_Base_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) M B" >$@
 
-Menu_Linker_Options: gen$x
+Menu_Linker_Options: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) M L" >$@
 
-Item_Rep: gen$x
+Item_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) M I" >$@
 ################################################################################
-Form_Opt_Rep: gen$x
+Form_Opt_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) F R" >$@
 
-Form_Base_Defs: gen$x
+Form_Base_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) F B" >$@
 
-Form_Linker_Options: gen$x
+Form_Linker_Options: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) F L" >$@
 
-Field_Rep: gen$x
+Field_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) F I" >$@
 ################################################################################
-Mouse_Base_Defs: gen$x
+Mouse_Base_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) P B" >$@
 
-Mouse_Event_Rep: gen$x
+Mouse_Event_Rep: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) P M" >$@
 
-Mouse_Events: gen$x
+Mouse_Events: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) B E" >$@
 
-Panel_Linker_Options: gen$x
+Panel_Linker_Options: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) P L" >$@
 
-Chtype_Def: gen$x
+Chtype_Def: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) E C" >$@
 
-Eti_Defs: gen$x
+Eti_Defs: $(PROG_GENERATE)
 	$(WRAPPER) "$(GENERATE) E E" >$@
 ################################################################################
 $(ADA_SRCDIR)/$(ABASE).ads: 	$(srcdir)/$(ABASE).ads.m4 \
@@ -333,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 |\
@@ -389,7 +362,7 @@ tags:
 @MAKE_UPPER_TAGS@	etags *.[ch]
 
 mostlyclean ::
-	-rm -f a.out core gen$x *.o
+	-rm -f a.out core $(PROG_GENERATE) *.o
 	-rm -f $(GEN_FILES1)
 	-rm -f $(GEN_FILES2)
 	-rm -f $(GEN_FILES3)
@@ -405,7 +378,7 @@ distclean :: clean
 
 realclean :: distclean
 
-HTML_DIR = ../../doc/html/ada
+HTML_DIR = @ADAHTML_DIR@
 
 instab.tmp : table.m4 $(GEN_SRC)
 	@rm -f $@
@@ -433,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` ;\