[PragmARC] · Let build_pragmarc.gpr be build_pragmarc.gpr. · Marked the library as relocatable in pragmarc.gp

[Björn Persson]

commit 2573f7c780d23ac8bd6f0baefe36684ae674bdb4
Author: Björn Persson <bjorn at rombobjörn.se>
Date:   Thu Jan 5 09:03:51 2012 +0100

    · Let build_pragmarc.gpr be build_pragmarc.gpr.
    · Marked the library as relocatable in pragmarc.gpr.

 PragmARC.spec      |    9 ++++++---
 build_pragmarc.gpr |    6 +++---
 pragmarc.gpr       |   11 ++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/PragmARC.spec b/PragmARC.spec
index 1dadb4a..d96220c 100644
--- a/PragmARC.spec
+++ b/PragmARC.spec
@@ -1,6 +1,6 @@
 Name:           PragmARC
 Version:        20060427
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        PragmAda Reusable Components, a component library for Ada
 Summary(sv):    PragmAda Reusable Components, ett komponentbibliotek för ada
 
@@ -48,14 +48,14 @@ för att utveckla program som använder %{name}.
 %prep
 %setup -c -T
 unzip %{SOURCE1}
-cp -p %{SOURCE2} pragmarc.gpr
+cp -p %{SOURCE2} .
 
 
 %build
 # Delete files that won't be used.
 rm compile_all.adb assertion_handler.adb
 # Compile the library.
-gnatmake -P pragmarc.gpr %{Gnatmake_optflags} -XDESTDIR=build_target -XLDFLAGS=%{__global_ldflags}
+gnatmake -P build_pragmarc.gpr %{Gnatmake_optflags} -XDESTDIR=build_target -XLDFLAGS=%{__global_ldflags}
 # Remove the unnecessary runpath that Gnatmake added.
 chrpath --delete build_target%{_libdir}/libpragmarc.so.%{version}
 # Convert line breaks.
@@ -87,6 +87,9 @@ cp -p %{SOURCE3} %{buildroot}%{_GNAT_project_dir}/
 
 
 %changelog
+* Thu Jan 05 2012 Björn Persson <bjorn at rombobjörn.se> - 20060427-13
+- Marked the library as relocatable in the Gnat project file.
+
 * Thu Aug 04 2011 Björn Persson <bjorn at rombobjörn.se> - 20060427-12
 - Added support for linker options.
 - Improved the description of PragmARC-devel.
diff --git a/build_pragmarc.gpr b/build_pragmarc.gpr
index 5d7f4b2..6a989c9 100644
--- a/build_pragmarc.gpr
+++ b/build_pragmarc.gpr
@@ -1,13 +1,13 @@
 -- This project file works together with the RPM spec file to compile the
 -- PragmARCs into an RPM package.
--- Copyright 2009 - 2011 B. Persson, Bjorn at Rombobeorn.se
+-- Copyright 2009 - 2012 B. Persson, Bjorn at Rombobeorn.se
 --
 -- This is free software; you can redistribute it and/or modify it under
 -- terms of the GNU General Public License as published by the Free Software
 -- Foundation; either version 2, or (at your option) any later version.
 
 with "directories";
-project PragmARC is
+project Build_PragmARC is
 
    Version := external("RPM_PACKAGE_VERSION");
    Destdir := external("DESTDIR");
@@ -93,4 +93,4 @@ project PragmARC is
       for Default_Switches ("Ada") use ("-gnato", "-gnat95");
    end Builder;
 
-end PragmARC;
+end Build_PragmARC;
diff --git a/pragmarc.gpr b/pragmarc.gpr
index f85c741..58f71da 100644
--- a/pragmarc.gpr
+++ b/pragmarc.gpr
@@ -1,5 +1,5 @@
 -- Projects that use the PragmAda Reusable Components should import this file.
--- Copyright 2009 - 2011 B. Persson, Bjorn at Rombobeorn.se
+-- Copyright 2009 - 2012 B. Persson, Bjorn at Rombobeorn.se
 --
 -- This is free software; you can redistribute it and/or modify it under
 -- terms of the GNU General Public License as published by the Free Software
@@ -7,9 +7,10 @@
 
 with "directories";
 project PragmARC is
-   for Library_Name use "pragmarc";
-   for Source_Dirs use (Directories.Includedir & "/pragmarc");
-   for Library_Dir use Directories.Libdir;
-   for Library_ALI_Dir use Directories.Libdir & "/pragmarc";
+   for Library_Name     use "pragmarc";
+   for Library_Kind     use "relocatable";
+   for Source_Dirs      use (Directories.Includedir & "/pragmarc");
+   for Library_Dir      use Directories.Libdir;
+   for Library_ALI_Dir  use Directories.Libdir & "/pragmarc";
    for Externally_Built use "true";
 end PragmARC;