Avoid shared.gpr project file

as suggested by Alire documentation to minimize project file clashes.

Author: reznikmm

.gitignore

@@ -20,7 +20,7 @@ po/Makefile
 b~*.ad*
 config.log
 config.status
-shared.gpr
+gtk_shared.gpr
 contrib/generated/*.ad?
 contrib/generated/tmp.ada
 src/Makefile.common

Makefile.in

@@ -142,7 +142,7 @@ clean-generic:
 	-${RM} .\#*
 
 mostlyclean-generic: clean-generic
-	-${RM} Makefile src/config.h shared.gpr
+	-${RM} Makefile src/config.h gtkada_shared.gpr
 	-${RM} testgtk/opengl/view_gl.adb
 
 clean/%: force

configure

@@ -4369,7 +4369,7 @@ fi
 
 libdir='${prefix}/lib'
 
-ac_config_files="$ac_config_files Makefile shared.gpr po/Makefile docs/gtkada_rm/html/static/index.html"
+ac_config_files="$ac_config_files Makefile gtkada_shared.gpr po/Makefile docs/gtkada_rm/html/static/index.html"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5077,7 +5077,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "shared.gpr") CONFIG_FILES="$CONFIG_FILES shared.gpr" ;;
+    "gtkada_shared.gpr") CONFIG_FILES="$CONFIG_FILES gtkada_shared.gpr" ;;
     "po/Makefile") CONFIG_FILES="$CONFIG_FILES po/Makefile" ;;
     "docs/gtkada_rm/html/static/index.html") CONFIG_FILES="$CONFIG_FILES docs/gtkada_rm/html/static/index.html" ;;
 

configure.ac

@@ -40,7 +40,7 @@ AM_PATH_GTK
 
 libdir='${prefix}/lib'
 
-AC_OUTPUT(Makefile shared.gpr po/Makefile docs/gtkada_rm/html/static/index.html)
+AC_OUTPUT(Makefile gtkada_shared.gpr po/Makefile docs/gtkada_rm/html/static/index.html)
 
 AC_MSG_NOTICE([--------- Summary for Gtkada $PACKAGE_VERSION -----------------])
 AC_MSG_NOTICE(AC_HELP_STRING(

gtkada_gps.gpr

@@ -25,13 +25,13 @@ with "testgtk/testgtk";
 with "src/gtkada";
 with "src/opengl/opengl";
 with "src/tools/tools";
-with "shared";
+with "gtkada_shared";
 with "contrib/contrib";
 
 project GtkAda is
    for Source_Files use ();
    for Object_Dir use "src/obj";
 
-   package IDE           renames Shared.IDE;
-   package Documentation renames Shared.Documentation;
+   package IDE           renames GtkAda_Shared.IDE;
+   package Documentation renames GtkAda_Shared.Documentation;
 end GtkAda;

shared.gpr.in gtkada_shared.gpr.in

@@ -23,7 +23,7 @@
 
 with "gtk";
 
-project Shared is
+project GtkAda_Shared is
 
    type Build_Type is ("Debug", "Production");
    Build : Build_Type := external ("BUILD", "@BUILD_TYPE@");
@@ -84,9 +84,11 @@ project Shared is
 
       case Build is
          when "Debug" =>
-            for Global_Configuration_Pragmas use Shared'Project_Dir & "src/gnat_debug.adc";
+            for Global_Configuration_Pragmas use
+              GtkAda_Shared'Project_Dir & "src/gnat_debug.adc";
          when "Production" =>
-            for Global_Configuration_Pragmas use Shared'Project_Dir & "src/gnat.adc";
+            for Global_Configuration_Pragmas use
+              GtkAda_Shared'Project_Dir & "src/gnat.adc";
       end case;
    end Builder;
 
@@ -111,4 +113,4 @@ project Shared is
       for Documentation_Dir use "html";
    end Documentation;
 
-end Shared;
+end GtkAda_Shared;

src/gtkada.gpr

@@ -21,32 +21,32 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with "../shared";
+with "../gtkada_shared";
 
 library project GtkAda is
-   case Shared.Need_Objective_C is
+   case GtkAda_Shared.Need_Objective_C is
       when "yes" => for Languages use ("C", "Ada", "Objective-C");
       when "no"  => for Languages use ("C", "Ada");
    end case;
 
-   Version := Shared.Version;
+   Version := GtkAda_Shared.Version;
 
    --  Put "generated" first, so that files are preferably taken from there
    --  even if they still exist in "."
    for Source_Dirs use ("generated", ".");
 
-   for Library_Kind use Shared.Library_Kind;
+   for Library_Kind use GtkAda_Shared.Library_Kind;
    for Library_Name use "gtkada";
    for Library_Version use
-      "lib" & Project'Library_Name & Shared.So_Ext & "." & Version;
+      "lib" & Project'Library_Name & GtkAda_Shared.So_Ext & "." & Version;
 
-   case Shared.Library_Kind is
+   case GtkAda_Shared.Library_Kind is
       when "static-pic" | "relocatable" =>
          --  Objects used for static-pic and relocatable are exactly the same
          for Object_Dir use "obj/gtkada/relocatable";
          for Library_Dir use "lib/gtkada/relocatable";
       when "static" =>
-         case Shared.So_Ext is
+         case GtkAda_Shared.So_Ext is
             when ".dll" | ".dylib" =>
                --  On Windows and Darwin, objects are always position
                --  independent.
@@ -60,22 +60,22 @@ library project GtkAda is
          end case;
    end case;
 
-   case Shared.Library_Kind is
+   case GtkAda_Shared.Library_Kind is
       when "relocatable" =>
-         for Leading_Library_Options use Shared.Ldflags;
-         for Library_Options use Shared.Gtk_Libs;
+         for Leading_Library_Options use GtkAda_Shared.Ldflags;
+         for Library_Options use GtkAda_Shared.Gtk_Libs;
       when others =>
          null;
    end case;
 
-   package Builder  renames Shared.Builder;
-   package Naming   renames Shared.Naming;
-   package Compiler renames Shared.Compiler;
-   package Binder   renames Shared.Binder;
-   package IDE      renames Shared.IDE;
+   package Builder  renames GtkAda_Shared.Builder;
+   package Naming   renames GtkAda_Shared.Naming;
+   package Compiler renames GtkAda_Shared.Compiler;
+   package Binder   renames GtkAda_Shared.Binder;
+   package IDE      renames GtkAda_Shared.IDE;
 
    package Linker is
-      for Linker_Options use Shared.Gtk_Libs;
+      for Linker_Options use GtkAda_Shared.Gtk_Libs;
    end Linker;
 
    package Install is

src/tools/tools.gpr

@@ -22,20 +22,20 @@
 ------------------------------------------------------------------------------
 
 with "../gtkada";
-with "../../shared";
+with "../../gtkada_shared";
 
 project Tools is
    for Main use ("gdialog.adb");
    for Object_Dir use "../obj/tools/";
 
    package Builder  is
-      for Switches ("Ada") use Shared.Builder'Switches ("Ada");
+      for Switches ("Ada") use GtkAda_Shared.Builder'Switches ("Ada");
       for Executable ("gdialog.adb") use "gtkada-dialog";
    end Builder;
 
-   package Compiler renames Shared.Compiler;
-   package Binder   renames Shared.Binder;
-   package Linker   renames Shared.Linker;
-   package IDE      renames Shared.IDE;
+   package Compiler renames GtkAda_Shared.Compiler;
+   package Binder   renames GtkAda_Shared.Binder;
+   package Linker   renames GtkAda_Shared.Linker;
+   package IDE      renames GtkAda_Shared.IDE;
 
 end Tools;

testgtk/testgtk.gpr

@@ -21,7 +21,7 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with "../shared";
+with "../gtkada_shared";
 with "../src/gtkada";
 with "task_project/task_project";
 
@@ -36,10 +36,10 @@ project TestGtk is
    package Compiler is
       --  subprogram specs not required in testgtk
       for Switches ("Ada") use ("-g", "-O0", "-gnaty-s", "-gnatwJ")
-         & Shared.Adaflags;
+         & GtkAda_Shared.Adaflags;
    end Compiler;
 
-   package Linker renames Shared.Linker;
+   package Linker renames GtkAda_Shared.Linker;
 
    package Install is
       for artifacts ("share/examples/gtkada/testgtk") use