Adjusted project files

9 files changed, 29 insertions, 138 deletions

diff --git a/fltkada.gpr b/fltkada.gpr
index ea624f1..7fbd78d 100644
--- a/fltkada.gpr
+++ b/fltkada.gpr
@@ -5,14 +5,12 @@ library project FLTKAda is
 
     for Languages use ("Ada", "C++");
 
-
     for Source_Dirs use ("src");
     for Object_Dir use "obj";
     for Library_Dir use "lib";
     for Library_Name use "fltkada";
     for Library_Kind use "dynamic";
 
-
     package Compiler is
         for Default_Switches("Ada") use ("-gnaty4aAbcefhiklM100nprt");
         for Default_Switches("C++") use ("-Wall","-Wextra","-std=c++11");
diff --git a/proj/adjuster_test.gpr b/proj/adjuster_test.gpr
deleted file mode 100644
index 4197dd5..0000000
--- a/proj/adjuster_test.gpr
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-with
-
-    "fltkada",
-    "shared";
-
-
-project Adjuster_Test is
-
-
-    for Languages use ("Ada");
-
-    for Source_Dirs use ("../test/**");
-    for Object_Dir use "../obj";
-    for Exec_Dir use "../bin";
-    for Main use ("adjuster_test.adb");
-
-    package Builder is
-        for Executable ("adjuster_test.adb") use "adjuster";
-    end Builder;
-
-    package Compiler renames Shared.Compiler;
-
-
-end Adjuster_Test;
-
-
diff --git a/proj/compare.gpr b/proj/compare.gpr
deleted file mode 100644
index fc46807..0000000
--- a/proj/compare.gpr
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-with
-
-    "fltkada",
-    "shared";
-
-
-project Compare is
-
-
-    for Languages use ("Ada");
-
-    for Source_Dirs use ("../test/**");
-    for Object_Dir use "../obj";
-    for Exec_Dir use "../bin";
-    for Main use ("compare.adb");
-
-    package Builder is
-        for Executable ("compare.adb") use "compare";
-    end Builder;
-
-    package Compiler renames Shared.Compiler;
-
-
-end Compare;
-
-
diff --git a/proj/dirlist.gpr b/proj/dirlist.gpr
deleted file mode 100644
index ed096f2..0000000
--- a/proj/dirlist.gpr
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-with
-
-    "fltkada",
-    "shared";
-
-
-project Dirlist is
-
-
-    for Languages use ("Ada");
-
-    for Source_Dirs use ("../test/**");
-    for Object_Dir use "../obj";
-    for Exec_Dir use "../bin";
-    for Main use ("dirlist.adb");
-
-    package Builder is
-        for Executable ("dirlist.adb") use "dirlist";
-    end Builder;
-
-    package Compiler renames Shared.Compiler;
-
-
-end Dirlist;
-
-
diff --git a/proj/page_formats.gpr b/proj/page_formats.gpr
deleted file mode 100644
index 0e0ebfe..0000000
--- a/proj/page_formats.gpr
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-with
-
-    "fltkada",
-    "shared";
-
-
-project Page_Formats is
-
-
-    for Languages use ("Ada");
-
-    for Source_Dirs use ("../test/**");
-    for Object_Dir use "../obj";
-    for Exec_Dir use "../bin";
-    for Main use ("page_formats.adb");
-
-    package Builder is
-        for Executable ("page_formats.adb") use "page_formats";
-    end Builder;
-
-    package Compiler renames Shared.Compiler;
-
-
-end Page_Formats;
-
-
diff --git a/proj/shared.gpr b/proj/shared.gpr
deleted file mode 100644
index d16fc1a..0000000
--- a/proj/shared.gpr
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-abstract project Shared is
-
-
-    package Compiler is
-        for Default_Switches ("Ada") use ("-gnaty4aAbcefhiklM100nprt");
-    end Compiler;
-
-
-end Shared;
-
-
diff --git a/test/adjuster_test.adb b/test/adjuster.adb
index 6b05b96..ef2bdfb 100644
--- a/test/adjuster_test.adb
+++ b/test/adjuster.adb
@@ -15,7 +15,7 @@ with
     FLTK.Widgets.Valuators.Adjusters;
 
 
-function Adjuster_Test
+function Adjuster
     return Integer
 is
 
@@ -74,6 +74,6 @@ begin
     return FLTK.Run;
 
 
-end Adjuster_Test;
+end Adjuster;
 
 
diff --git a/tests.gpr b/tests.gpr
index deb6523..4ff8cfc 100644
--- a/tests.gpr
+++ b/tests.gpr
@@ -1,12 +1,32 @@
 
 
-aggregate project Tests is
+with
+
+    "fltkada";
+
+
+project Tests is
+
+
+    for Languages use ("Ada");
+
+    for Source_Dirs use ("test/**");
+    for Object_Dir use "obj";
+    for Exec_Dir use "bin";
+
+    for Main use ("adjuster.adb", "compare.adb", "dirlist.adb", "page_formats.adb");
+
+    package Builder is
+        for Executable ("adjuster.adb")     use "adjuster";
+        for Executable ("compare.adb")      use "compare";
+        for Executable ("dirlist.adb")      use "dirlist";
+        for Executable ("page_formats.adb") use "page_formats";
+    end Builder;
+
+    package Compiler is
+        for Default_Switches ("Ada") use ("-gnaty4aAbcefhiklM100nprt");
+    end Compiler;
 
-    for Project_Files use
-       ("proj/adjuster_test.gpr",
-        "proj/compare.gpr",
-        "proj/dirlist.gpr",
-        "proj/page_formats.gpr");
 
 end Tests;
 
diff --git a/tools.gpr b/tools.gpr
index faa4a95..361664b 100644
--- a/tools.gpr
+++ b/tools.gpr
@@ -5,18 +5,16 @@ project Tools is
 
     for Languages use ("Ada");
 
-
     for Source_Dirs use ("tool");
     for Object_Dir use "obj";
     for Exec_Dir use "bin";
-    for Main use ("template.adb");
 
+    for Main use ("template.adb");
 
     package Builder is
         for Executable ("template.adb") use "template";
     end Builder;
 
-
     package Compiler is
         for Default_Switches("Ada") use ("-gnaty4aAbcefhiklM100nprt");
     end Compiler;