X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=Ada95%2Fsrc%2Flibrary.gpr;fp=Ada95%2Fsrc%2Flibrary.gpr.sed;h=e7380f09f7fc6e95864867d31592d1fa03af1983;hp=28b0b1cd869322738d378b015aa7c725862d176c;hb=bd0d93918c967f71d8e287fd6714f0b88da820da;hpb=34d602f272c394e9a980438e636e1ce4d355f83b

diff --git a/Ada95/src/library.gpr.sed b/Ada95/src/library.gpr
similarity index 81%
rename from Ada95/src/library.gpr.sed
rename to Ada95/src/library.gpr
index 28b0b1cd..e7380f09 100644
--- a/Ada95/src/library.gpr.sed
+++ b/Ada95/src/library.gpr
@@ -25,32 +25,32 @@
 -- sale, use or other dealings in this Software without prior written       --
 -- authorization.                                                           --
 ------------------------------------------------------------------------------
--- $Id: library.gpr.sed,v 1.2 2014/05/24 21:28:29 tom Exp $
+-- $Id: library.gpr,v 1.9 2014/06/01 01:13:09 tom Exp $
 -- http://gcc.gnu.org/onlinedocs/gnat_ugn_unw/Library-Projects.html
 -- http://www.adaworld.com/debian/debian-ada-policy.html
 project Library is
   Build_Dir := External ("BUILD_DIR");
+  Source_Dir := External ("SOURCE_DIR");
+  Source_Dir2 := External ("SOURCE_DIR2");
+  Kind := External ("LIB_KIND");
   for Library_Name use External ("LIB_NAME");
   for Library_Version use External ("SONAME");
-  for Library_Kind use "dynamic";
+
+  for Library_Kind use Kind;
   for Library_Dir use Build_Dir & "/lib";
-  for Object_Dir use Build_Dir & "/dynamic-obj";
-  for Library_ALI_Dir use Build_Dir & "/dynamic-ali";
-  for Source_Dirs use (".");
-  for Library_Options use
-    External_As_List ("LDFLAGS", " ")   --  before libraries.
-    & ("-lncurses", "-lpanel", "-lmenu", "-lform");
+  for Object_Dir use Build_Dir & "/" & Kind & "-obj";
+  for Library_ALI_Dir use Build_Dir & "/" & Kind & "-ali";
+  for Source_Dirs use (Source_Dir & "/src",
+                       Source_Dir2,
+                       Build_Dir & "/src");
+  for Library_Options use ("-lncurses", "-lpanel", "-lmenu", "-lform");
   package Compiler is
      for Default_Switches ("Ada") use
        ("-g",
         "-O2",
         "-gnatafno",
         "-gnatVa",   -- All validity checks
-        "-gnatwa")   -- Activate all optional errors
-       & External_As_List ("ADAFLAGS", " "); --  after default options
+        "-gnatwa");  -- Activate all optional errors
   end Compiler;
-
-  --  gnatmake ignores C sources, but this option will let it embed
-  --  objects found in the Object_Dir.
   for Languages use ("C", "Ada");
 end Library;