Rombobjörn

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL3
-rw-r--r--comfignat.mk13
-rwxr-xr-xmanual.en.html2
3 files changed, 12 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 10e53ff..982d5a7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -233,6 +233,9 @@ options are passed to them:
The command for invoking the builder, that is GPRbuild or Gnatmake.
Default: gprbuild
+ GNATPREPFLAGS
+ A space-separated list of options to be passed to Gnatprep.
+
GNATFLAGS
A space-separated list with all of the optional parameters to be passed to
the builder, including any options to be forwarded to the compiler, binder
diff --git a/comfignat.mk b/comfignat.mk
index df2f654..9bc4f7b 100644
--- a/comfignat.mk
+++ b/comfignat.mk
@@ -61,8 +61,8 @@ GNATFLAGS ?= ${if ${findstring gnatmake, \
# (DESTDIR is also supported.)
# Containing makefiles may assign default values to the options variables
-# GNAT_BUILDER_FLAGS, ADAFLAGS, CPPFLAGS, CFLAGS, CXXFLAGS, FFLAGS,
-# GNATBINDFLAGS, GNATLINKFLAGS and LDFLAGS if they are undefined in the
+# GNATPREPFLAGS, GNAT_BUILDER_FLAGS, ADAFLAGS, CPPFLAGS, CFLAGS, CXXFLAGS,
+# FFLAGS, GNATBINDFLAGS, GNATLINKFLAGS and LDFLAGS if they are undefined in the
# environment, but should expect that users and distributions may override
# those defaults.
@@ -173,7 +173,8 @@ preprocess_file = "${GNATPREP}" ${firstword ${filter %.gp,$^}} $@ \
${options_preprocessing} ${Gnatprep_arguments} \
${if ${filter ${notdir $@},${notdir ${usage_GPRs}}}, \
${usage_directories}, \
- '-DSrcdir="${srcdir}"'}
+ '-DSrcdir="${srcdir}"'} \
+ ${GNATPREPFLAGS}
# preprocess_file is a command for use in recipes. It runs the first .gp file
# among the rule's prerequisites through Gnatprep to produce the target. If the
# target is a usage project, then the usage-relevant directory variables are
@@ -245,8 +246,8 @@ VPATH += ${srcdir} ${builddir}
configuration_variables += \
GNATPREP GNAT_BUILDER \
- GNAT_BUILDER_FLAGS ADAFLAGS CPPFLAGS CFLAGS CXXFLAGS FFLAGS GNATBINDFLAGS \
- GNATLINKFLAGS LDFLAGS GNATFLAGS \
+ GNATPREPFLAGS GNAT_BUILDER_FLAGS ADAFLAGS CPPFLAGS CFLAGS CXXFLAGS FFLAGS \
+ GNATBINDFLAGS GNATLINKFLAGS LDFLAGS GNATFLAGS \
DESTDIR \
dirgpr relocatable_package \
prefix exec_prefix datarootdir localstatedir \
@@ -579,7 +580,7 @@ show_configuration::
# How to preprocess the project Comfignat:
${builddir}/comfignat.gpr: comfignat.gpr.gp | ${builddir}/
- "${GNATPREP}" $< $@ -DInvoked_By_Makefile ${all_directories}
+ "${GNATPREP}" $< $@ -DInvoked_By_Makefile ${all_directories} ${GNATPREPFLAGS}
# How to preprocess files that are needed during the build:
${builddir}/%: %.gp | ${builddir}/
diff --git a/manual.en.html b/manual.en.html
index 92988e8..c219442 100755
--- a/manual.en.html
+++ b/manual.en.html
@@ -655,6 +655,8 @@ Standards.</p></li>
<li><p>Comfignat's behaviour in sub-Makes was fixed so that subprocesses
working in subdirectories use the right build and staging directories.</p></li>
+<li><p>The options variable <var>GNATPREPFLAGS</var> was added.</p></li>
+
<li><p>The ability to save environment variables in the persistent
configuration was added.</p></li>