Rombobjörn

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comfignat.gpr.in10
-rw-r--r--comfignat.mk29
2 files changed, 21 insertions, 18 deletions
diff --git a/comfignat.gpr.in b/comfignat.gpr.in
index 233c71a..c459bf7 100644
--- a/comfignat.gpr.in
+++ b/comfignat.gpr.in
@@ -15,13 +15,13 @@
-- project files. It is not to be installed on the target system.
--
-- Normally the preprocessing of this file will be controlled by comfignat.mk,
--- which will make it import the directory project if one is provided. It can
+-- which will make it import the directories project if one is provided. It can
-- also be preprocessed manually if Make cannot be used for some reason. There
-- are defaults that will be used if no preprocessor symbols are defined.
-#if Directory_GPR'Defined then
- with $Directory_GPR;
+#if Directories_GPR'Defined then
+ with $Directories_GPR;
#end if;
abstract project Comfignat is
@@ -33,12 +33,12 @@ abstract project Comfignat is
#end if;
-- Intermediate files produced during the build shall be kept in Objdir.
- #if Directory_Project'Defined then
+ #if Directories_Project'Defined then
-- Put intermediate files for different architectures in subdirectories
-- where they won't conflict with each other. (This is useful especially
-- with binder files when they are packaged in debug information packages
-- for multiarch systems.)
- Objdir := Objdir & "/" & $Directory_Project.Hardware_Platform;
+ Objdir := Objdir & "/" & $Directories_Project.Hardware_Platform;
#end if;
#if Stagedir'Defined then
diff --git a/comfignat.mk b/comfignat.mk
index e64eab6..c9a34b6 100644
--- a/comfignat.mk
+++ b/comfignat.mk
@@ -19,7 +19,7 @@
# system. Usage projects and the Comfignat project will be preprocessed with
# Gnatprep. (Build projects may also be preprocessed.)
#
-# If a directory project is provided, then the project files will get the
+# If a directories project is provided, then the project files will get the
# directory variables from there, otherwise the Make variables will be used.
#
# This file may not work with other Make clones than GNU Make. (Reusable Make
@@ -36,6 +36,9 @@
GNATPREP ?= gnatprep
GNAT_BUILDER ?= gprbuild
+# If GNAT_BUILDER looks like it will invoke Gnatmake, then make the default
+# value of GNATFLAGS compatible with Gnatmake. Otherwise make it suitable for
+# building multi-language projects with GPRbuild.
GNATFLAGS ?= ${if ${findstring gnatmake, \
${notdir ${call mung,${GNAT_BUILDER}}}}, \
${GNAT_BUILDER_FLAGS} \
@@ -64,10 +67,10 @@ GNATFLAGS ?= ${if ${findstring gnatmake, \
#
dirgpr =
-# dirgpr should be the filename of the target system's directory project if
-# there is one. Project files will be configured to use the directory project,
-# and the Gnatprep symbols Directory_GPR and Directory_Project will be derived
-# from dirgpr.
+# dirgpr should be the filename of the target system's directories project if
+# there is one. The Gnatprep symbols Directories_GPR and Directories_Project
+# will be derived from dirgpr, and project files will be configured to use the
+# directories project.
prefix = /usr/local
exec_prefix = ${prefix}
@@ -203,18 +206,18 @@ directories := '-DObjdir="${objdir}"' '-DStagedir="${stagedir}"'
ifneq (${dirgpr},)
- # A directory project is used, so make project files take the directory
+ # A directories project is used, so make project files take the directory
# variables from there.
- directory_project := ${basename ${notdir ${dirgpr}}}
- directories += '-DDirectory_GPR="${dirgpr}"'
- directories += '-DDirectory_Project=${directory_project}'
+ directories_project := ${basename ${notdir ${dirgpr}}}
+ directories += '-DDirectories_GPR="${dirgpr}"'
+ directories += '-DDirectories_Project=${directories_project}'
directories += '-DPrefix="${prefix}"'
directories += '-DExec_Prefix="${exec_prefix}"'
- directories += '-DBindir=${directory_project}.Bindir'
- directories += '-DLibexecdir=${directory_project}.Libexecdir'
- directories += '-DIncludedir=${directory_project}.Includedir'
- directories += '-DLibdir=${directory_project}.Libdir'
+ directories += '-DBindir=${directories_project}.Bindir'
+ directories += '-DLibexecdir=${directories_project}.Libexecdir'
+ directories += '-DIncludedir=${directories_project}.Includedir'
+ directories += '-DLibdir=${directories_project}.Libdir'
else ifeq (${relocatable_package},true)