# patch by Thomas E. Dickey # created Sat Aug 17 20:18:16 UTC 2019 # ------------------------------------------------------------------------------ # gen/adacurses-config.in | 6 ++-- # src/Makefile.in | 60 +++++++++------------------------------------- # src/library-cfg.sh | 2 - # src/library.gpr | 18 ++++++++++--- # 4 files changed, 30 insertions(+), 56 deletions(-) # ------------------------------------------------------------------------------ Index: Ada95/gen/adacurses-config.in Prereq: 1.11 --- ncurses-6.1-20190810+/Ada95/gen/adacurses-config.in 2016-11-05 20:48:35.000000000 +0000 +++ ncurses-6.1-20190810-proposal01/Ada95/gen/adacurses-config.in 2019-08-17 20:15:57.477106931 +0000 @@ -35,13 +35,13 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ -ADA_INCLUDE=@ADA_INCLUDE@ -ADA_OBJECTS=@ADA_OBJECTS@ +ADA_INCLUDE=${prefix}/include/adacurses/adacurses +ADA_OBJECTS=${prefix}/lib/adacurses/adacurses VERSION=@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@ CFLAGS="-aI$ADA_INCLUDE -aO$ADA_OBJECTS" -LIBS="-L$ADA_OBJECTS -lAdaCurses" +LIBS="-L$ADA_OBJECTS -ladacurses" THIS="adacurses" THIS_CFG="$THIS@DFT_ARG_SUFFIX@-config" Index: Ada95/src/Makefile.in Prereq: 1.83 --- ncurses-6.1-20190810+/Ada95/src/Makefile.in 2018-11-10 21:53:33.000000000 +0000 +++ ncurses-6.1-20190810-proposal01/Ada95/src/Makefile.in 2019-08-17 20:15:57.477106931 +0000 @@ -87,10 +87,10 @@ ADAPREP = gnatprep ADAFLAGS = @ADAFLAGS@ -I. -I$(srcdir) -LIB_NAME = AdaCurses +LIB_NAME = adacurses SONAME = @ADA_SHAREDLIB@ -GNAT_PROJECT = AdaCurses.gpr +GNAT_PROJECT = adacurses.gpr # build/source are the Ada95 tree BUILD_DIR = .. @@ -176,9 +176,6 @@ all :: $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) @echo done -$(ADA_INCLUDE) \ -$(ADA_OBJECTS) \ -$(LIBDIR) \ $(BUILD_DIR_LIB) : mkdir -p $@ @@ -194,18 +191,6 @@ $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) @echo made $(STATIC_LIBNAME) -install \ -install.libs :: \ - $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) \ - $(ADA_OBJECTS) - @$(INSTALL_LIB) \ - $(BUILD_DIR_LIB)/$(STATIC_LIBNAME) \ - $(ADA_OBJECTS) - -uninstall \ -uninstall.libs :: - @rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME) - mostlyclean :: rm -f *.o *.ali b_t*.* *.s $(PROGS) a.out core b_*_test.c *.xr[bs] *.a @@ -270,25 +255,19 @@ @USE_GNAT_PROJECTS@ $(ABASE)-trace.adb \ @USE_GNAT_PROJECTS@ $(STATIC_C_OBJS) \ @USE_GNAT_PROJECTS@ $(STATIC_DIRS) -@USE_GNAT_PROJECTS@ @cf_ada_config@gprconfig --batch --config=Ada --config=C,,,,@cf_ada_config_C@ @USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT) -@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) >$(GNAT_PROJECT) +@USE_GNAT_PROJECTS@ $(SHELL) $(srcdir)/library-cfg.sh static $(srcdir)/library.gpr $(CFLAGS_NORMAL) > $(GNAT_PROJECT) @USE_GNAT_PROJECTS@ @echo "Using GNAT Project:" @USE_GNAT_PROJECTS@ @-$(SHELL) -c "diff -u $(srcdir)/library.gpr $(GNAT_PROJECT); exit 0" -@USE_GNAT_PROJECTS@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=static -@USE_GNAT_PROJECTS@ $(AR) $(ARFLAGS) $@ $(STATIC_C_OBJS) -@USE_GNAT_PROJECTS@ -rm -f $(GNAT_PROJECT) +@USE_GNAT_PROJECTS@ gprbuild -p $(ADAMAKEFLAGS) -XLIB_KIND=static @USE_GNAT_PROJECTS@ @USE_GNAT_LIBRARIES@install \ -@address@hidden :: \ -@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS) -@USE_GNAT_LIBRARIES@ $(INSTALL_LIB) \ -@USE_GNAT_LIBRARIES@ $(BUILD_DIR)/static-ali/*.ali \ -@USE_GNAT_LIBRARIES@ $(ADA_OBJECTS) +@address@hidden :: +@USE_GNAT_LIBRARIES@ gprinstall -f -p --prefix="$(prefix)" $(ADAMAKEFLAGS) -XLIB_KIND=static uninstall \ uninstall.libs :: - @rm -f $(ADA_OBJECTS)/$(STATIC_LIBNAME) + gprinstall -f --prefix="$(prefix)" --uninstall $(ADAMAKEFLAGS) -XLIB_KIND=static @USE_GNAT_LIBRARIES@uninstall \ @address@hidden :: @@ -316,22 +295,6 @@ @MAKE_ADA_SHAREDLIB@ $(ADAMAKE) $(ADAMAKEFLAGS) -XLIB_KIND=dynamic @MAKE_ADA_SHAREDLIB@ -rm -f $(GNAT_PROJECT) -install \ -install.libs :: $(ADA_INCLUDE) - $(INSTALL_LIB) \ - $(SOURCE_DIR_SRC)/*.ad[sb] \ - $(ADA_INCLUDE) - -install \ -install.libs :: $(ADA_INCLUDE) - $(INSTALL_LIB) \ - $(GENERATED_SOURCES) \ - $(ADA_INCLUDE) - -uninstall \ -uninstall.libs :: - $(SHELL) -c 'for name in $(SOURCE_DIR_SRC)/*.ad[sb] $(GENERATED_SOURCES); do rm -f $(ADA_INCLUDE)/`basename $$name`; done' - @MAKE_ADA_SHAREDLIB@install \ @address@hidden :: $(ADA_OBJECTS) $(LIBDIR) @MAKE_ADA_SHAREDLIB@ $(INSTALL_LIB) \ @@ -351,8 +314,9 @@ @MAKE_ADA_SHAREDLIB@ rm -f $(LIBDIR)/$(SHARED_SYMLINK) @MAKE_ADA_SHAREDLIB@ rm -f $(LIBDIR)/$(SHARED_LIBNAME) +rm-docs : + gnatdoc --enable-build $(ADAMAKEFLAGS) -XLIB_KIND=static + clean :: - -rm -f default.cgpr - -rm -rf $(BUILD_DIR)/*-ali - -rm -rf $(BUILD_DIR)/*-obj - -rm -rf $(BUILD_DIR_LIB) +@USE_GNAT_PROJECTS@ gprclean $(ADAMAKEFLAGS) -XLIB_KIND=static +@MAKE_ADA_SHAREDLIB@ gprclean $(ADAMAKEFLAGS) -XLIB_KIND=dynamic Index: Ada95/src/library-cfg.sh Prereq: 1.4 --- ncurses-6.1-20190810+/Ada95/src/library-cfg.sh 2018-11-10 22:58:52.000000000 +0000 +++ ncurses-6.1-20190810-proposal01/Ada95/src/library-cfg.sh 2019-08-17 20:15:57.477106931 +0000 @@ -58,6 +58,6 @@ sed \ -e '/for Library_Options use /s,-- ,'"$SHARE"',' \ -e '/for Default_Switches ("C") use/s,-- ,,' \ - -e '/for Default_Switches ("C") use/s% use .*'%" use($param);"% \ + -e '/for Default_Switches ("C") use/s% use.*'%" use($param);"% \ $input exit 0 Index: Ada95/src/library.gpr Prereq: 1.12 --- ncurses-6.1-20190810+/Ada95/src/library.gpr 2018-01-14 22:21:37.000000000 +0000 +++ ncurses-6.1-20190810-proposal01/Ada95/src/library.gpr 2019-08-17 20:15:57.477106931 +0000 @@ -48,10 +48,20 @@ for Default_Switches ("Ada") use ("-g", "-O2", - "-gnatafno", - "-gnatVa", -- All validity checks - "-gnatwa"); -- Activate all optional errors - -- for Default_Switches ("C") use + "-Wall", + "-gnatafUno", + "-gnatVaep", -- All validity checks + "-gnatw.eDH.Y"); -- Activate all optional warnings + -- for Default_Switches ("C") use end Compiler; for Languages use ("C", "Ada"); + package Install is + for Install_Name use "adacurses"; + -- for Artifacts ("share/doc/adacurses") use ("../doc/Ada95.html", "../doc/ada"); + for Artifacts ("share/doc/adacurses/adacurses_rm") use ("../" & Kind & "-obj" & "/gnatdoc/*"); + for Artifacts ("share/examples/adacurses") use + ("../samples/*.ad?", "../samples/explain.txt", "../samples/Makefile", "../samples/README"); + -- for Artifacts ("share/man/man1") use ("../doc/adacurses-config.1"); + for Artifacts ("bin") use ("../gen/adacurses-config"); + end Install; end AdaCurses;