diff options
| -rw-r--r-- | comfignat.mk | 74 | ||||
| -rw-r--r-- | testsuite/sources/library_1/Makefile | 2 | ||||
| -rw-r--r-- | testsuite/sources/library_1/subdir/helper/Makefile | 4 |
3 files changed, 40 insertions, 40 deletions
diff --git a/comfignat.mk b/comfignat.mk index 37af018..6f2d719 100644 --- a/comfignat.mk +++ b/comfignat.mk @@ -88,8 +88,8 @@ relative_to = \ # · Reverse the protection of space and percent characters. # · If the result is an empty string, then return "." instead. -make_pathname = ${call relative_to,${${1}},${CURDIR}} -# make_pathname takes the name of a variable whose value is an absolute +Make_pathname = ${call relative_to,${${1}},${CURDIR}} +# Make_pathname takes the name of a variable whose value is an absolute # pathname, and converts that pathname into the right form for usage in Make # targets, prerequisites and functions, which means that it is made relative # to the current working directory to prevent spaces in parent directories' @@ -231,26 +231,26 @@ stage_miscdocdir = ${stagedir}${miscdocdir} # These are the directories where different kinds of files to be installed are # written during the build. -make_srcdir = ${call make_pathname,srcdir} -make_builddir = ${call make_pathname,builddir} -make_objdir = ${call make_pathname,objdir} -make_stagedir = ${call make_pathname,stagedir} -make_bindir = ${call make_pathname,stage_bindir} -make_libexecdir = ${call make_pathname,stage_libexecdir} -make_datadir = ${call make_pathname,stage_datadir} -make_sysconfdir = ${call make_pathname,stage_sysconfdir} -make_statedir = ${call make_pathname,stage_statedir} -make_cachedir = ${call make_pathname,stage_cachedir} -make_logdir = ${call make_pathname,stage_logdir} -make_includedir = ${call make_pathname,stage_includedir} -make_archincludedir = ${call make_pathname,stage_archincludedir} -make_libdir = ${call make_pathname,stage_libdir} -make_alidir = ${call make_pathname,stage_alidir} -make_gprdir = ${call make_pathname,stage_gprdir} -make_localedir = ${call make_pathname,stage_localedir} -make_mandir = ${call make_pathname,stage_mandir} -make_infodir = ${call make_pathname,stage_infodir} -make_miscdocdir = ${call make_pathname,stage_miscdocdir} +Make_srcdir = ${call Make_pathname,srcdir} +Make_builddir = ${call Make_pathname,builddir} +Make_objdir = ${call Make_pathname,objdir} +Make_stagedir = ${call Make_pathname,stagedir} +Make_bindir = ${call Make_pathname,stage_bindir} +Make_libexecdir = ${call Make_pathname,stage_libexecdir} +Make_datadir = ${call Make_pathname,stage_datadir} +Make_sysconfdir = ${call Make_pathname,stage_sysconfdir} +Make_statedir = ${call Make_pathname,stage_statedir} +Make_cachedir = ${call Make_pathname,stage_cachedir} +Make_logdir = ${call Make_pathname,stage_logdir} +Make_includedir = ${call Make_pathname,stage_includedir} +Make_archincludedir = ${call Make_pathname,stage_archincludedir} +Make_libdir = ${call Make_pathname,stage_libdir} +Make_alidir = ${call Make_pathname,stage_alidir} +Make_gprdir = ${call Make_pathname,stage_gprdir} +Make_localedir = ${call Make_pathname,stage_localedir} +Make_mandir = ${call Make_pathname,stage_mandir} +Make_infodir = ${call Make_pathname,stage_infodir} +Make_miscdocdir = ${call Make_pathname,stage_miscdocdir} # These variables are for use in Make targets, prerequisites and other places # where Make expects space-separated lists. @@ -287,7 +287,7 @@ export Comfignat_overriding_absolute_builddir := ${builddir} # Read the configuration file if there is one: -configuration = ${make_builddir}/comfignat_configuration.mk +configuration = ${Make_builddir}/comfignat_configuration.mk -include ${configuration} @@ -349,7 +349,7 @@ endif ifneq (${origin preprocessed_files},file) preprocessed_files = \ ${filter-out ${notdir ${usage_GPRs}}, \ - ${basename ${notdir ${wildcard ${make_srcdir}/*.gp}}}} + ${basename ${notdir ${wildcard ${Make_srcdir}/*.gp}}}} endif # preprocessed_files is a list of files to be produced in the preprocessing # step at the beginning of the build. Containing makefiles may override it or @@ -383,11 +383,11 @@ endif # default values for optional arguments should be set in the options variables # instead. -VPATH += ${filter-out .,${make_srcdir} ${make_builddir}} +VPATH += ${filter-out .,${Make_srcdir} ${Make_builddir}} # VPATH is a list of directories that Make should search for prerequisites. # If VPATH has been defined as simply expanded before this file was included, -# then make_srcdir and make_builddir will be expanded now, so everything that's +# then Make_srcdir and Make_builddir will be expanded now, so everything that's # involved in their values must be defined before this point. configuration_variables += \ @@ -585,8 +585,8 @@ build_targets = ${addsuffix .phony_target,${build_GPRs}} # A phony target is defined for each build project, and the job of determining # whether the project needs rebuilding is delegated to the builder. -staged_usage_GPRs = ${addprefix ${make_gprdir}/,${usage_GPRs}} -preprocessed_files_in_builddir = ${addprefix ${make_builddir}/,${preprocessed_files}} +staged_usage_GPRs = ${addprefix ${Make_gprdir}/,${usage_GPRs}} +preprocessed_files_in_builddir = ${addprefix ${Make_builddir}/,${preprocessed_files}} # When usage projects are preprocessed they are written to stage_gprdir. Other # preprocessed files are assumed to be needed during the build and are written # to builddir. @@ -607,11 +607,11 @@ Comfignat_default_goal: build .PRECIOUS: %/ # This rule appears to work around a bug that was fixed in GNU Make 3.82: -${make_gprdir}/: +${Make_gprdir}/: mkdir -p $@ # How to initialize a build directory with a delegating makefile: -${make_builddir}/Makefile: | ${make_builddir}/ +${Make_builddir}/Makefile: | ${Make_builddir}/ @echo 'Writing $@.' @( echo 'Comfignat_default_goal: force ; ${delegation_command}'; \ echo '%: force ; ${delegation_command} $$@'; \ @@ -627,7 +627,7 @@ ${make_builddir}/Makefile: | ${make_builddir}/ # How to save configured variables: .PHONY: configure -configure:: ${make_builddir}/Makefile +configure:: ${Make_builddir}/Makefile @echo "Writing ${configuration}." @( ${foreach var,${configuration_variables}, \ ${if ${or ${findstring command line,${origin ${var}}}, \ @@ -672,19 +672,19 @@ show_configuration:: true # How to preprocess the project Comfignat: -${make_builddir}/comfignat.gpr: comfignat.gpr.gp | ${make_builddir}/ +${Make_builddir}/comfignat.gpr: comfignat.gpr.gp | ${Make_builddir}/ "${GNATPREP}" $< $@ -DInvoked_By_Makefile ${all_directories} ${GNATPREPFLAGS} # How to preprocess files that are needed during the build: -${make_builddir}/%: %.gp | ${make_builddir}/ +${Make_builddir}/%: %.gp | ${Make_builddir}/ ${preprocess_file} # How to preprocess usage projects: -${make_gprdir}/%: %.gp | ${make_gprdir}/ +${Make_gprdir}/%: %.gp | ${Make_gprdir}/ ${preprocess_file} # How to stage usage projects that don't need preprocessing: -${make_gprdir}/%: % | ${make_gprdir}/ +${Make_gprdir}/%: % | ${Make_gprdir}/ cp -p $< $@ .PHONY: preprocess @@ -711,7 +711,7 @@ build: base $${staged_usage_GPRs} all: build # Optional targets may be added as prerequisites of "all". -${make_stagedir}: +${Make_stagedir}: @${MAKE} build # "make install" straight out of a source package triggers a build, but if # something has been built then "make install" doesn't rebuild anything, just @@ -726,7 +726,7 @@ preinstall: # How to install what has been built and staged: .PHONY: install_stage -install_stage: ${make_stagedir} ${if ${call checked_true,do_preinstall},preinstall} +install_stage: ${Make_stagedir} ${if ${call checked_true,do_preinstall},preinstall} if [ "`echo "${stagedir}"/*`" != "${stagedir}/*" ]; then \ mkdir -p "${DESTDIR}/"; \ cp -RPf ${install_cp_flags} "${stagedir}"/* "${DESTDIR}/"; \ diff --git a/testsuite/sources/library_1/Makefile b/testsuite/sources/library_1/Makefile index 83ee65a..7ecb403 100644 --- a/testsuite/sources/library_1/Makefile +++ b/testsuite/sources/library_1/Makefile @@ -20,6 +20,6 @@ build_GPRs = build_testcase.gpr usage_GPRs = testcase.gpr submake: - @${MAKE} --directory=${make_srcdir}/subdir + @${MAKE} --directory=${Make_srcdir}/subdir build: submake diff --git a/testsuite/sources/library_1/subdir/helper/Makefile b/testsuite/sources/library_1/subdir/helper/Makefile index a02f8e3..04ed95b 100644 --- a/testsuite/sources/library_1/subdir/helper/Makefile +++ b/testsuite/sources/library_1/subdir/helper/Makefile @@ -13,7 +13,7 @@ include ../../comfignat.mk -build: ${make_libexecdir}/testcase/script +build: ${Make_libexecdir}/testcase/script -${make_libexecdir}/testcase/script: script | ${make_libexecdir}/testcase/ +${Make_libexecdir}/testcase/script: script | ${Make_libexecdir}/testcase/ cp -p $< $@ |