diff options
| author | Björn Persson <bjorn@rombobjörn.se> | 2013-06-05 22:24:36 +0200 |
|---|---|---|
| committer | Björn Persson <bjorn@rombobjörn.se> | 2013-06-05 22:24:36 +0200 |
| commit | bc3badc29e638c61f9d3968c4933cc6a921e0b3a (patch) | |
| tree | 8cf0d33830080028608cbef67a83948ea9bed3f6 | |
| parent | 3e0418ed7a2e6b838183ba6428f59a67ed3e565d (diff) | |
Included options in configuration_variables.
| -rw-r--r-- | comfignat.mk | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/comfignat.mk b/comfignat.mk index 7b9a19d..04d5caa 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -126,17 +126,6 @@ install_cp_flags = ${if ${DESTDIR},--preserve=timestamps,} # Containing makefiles should assign or append to these variables as needed: # -configuration_variables += \ - GNATPREP GNAT_BUILDER GNAT_BUILDER_FLAGS ADAFLAGS CPPFLAGS CFLAGS CXXFLAGS \ - FFLAGS GNATBINDFLAGS GNATLINKFLAGS LDFLAGS GNATFLAGS DESTDIR \ - dirgpr relocatable_package prefix exec_prefix bindir libexecdir datarootdir \ - datadir sysconfdir localstatedir statedir cachedir logdir runtimedir \ - lockdir includedir libdir gprdir localedir mandir infodir miscdocdir \ - builddir objdir stagedir install_cp_flags -# configuration_variables is a list of variables that can be saved in the -# persistent configuration with "make configure". Containing makefiles may -# append additional variable names. - ifneq (${origin preprocessed_files},file) preprocessed_files := ${basename ${wildcard *.in}} endif @@ -172,6 +161,22 @@ endif # Any text assigned to Gnatprep_definitions will be included in the Gnatprep # command line. It may be used for additional symbol definitions. +configuration_variables += \ + GNATPREP GNAT_BUILDER \ + GNAT_BUILDER_FLAGS ADAFLAGS CPPFLAGS CFLAGS CXXFLAGS FFLAGS GNATBINDFLAGS \ + GNATLINKFLAGS LDFLAGS GNATFLAGS \ + DESTDIR \ + dirgpr relocatable_package \ + prefix exec_prefix bindir libexecdir datarootdir datadir sysconfdir \ + localstatedir statedir cachedir logdir runtimedir lockdir includedir libdir \ + gprdir localedir mandir infodir miscdocdir \ + builddir objdir stagedir \ + install_cp_flags \ + ${options} +# configuration_variables is a list of variables that can be saved in the +# persistent configuration with "make configure". Containing makefiles may +# append additional variable names. + # # Containing makefiles may use this command variable: @@ -341,7 +346,7 @@ configure:: # overridden on the command line, and all that were previously configured, are # written to the configuration file. A variable is considered previously # configured if there is another variable with "_is_configured" appended to its -# name and a value of "true", and such a variable is also written for each +# name and a value of "true". Such a variable is also written for each # configured variable. It is therefore possible to delete a variable V from the # configuration by running "make configure V_is_configured=false". |