[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c02e1bd 1/4: Follow GNU coding standards more
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] master c02e1bd 1/4: Follow GNU coding standards more closely |
|
Date: |
Wed, 17 May 2017 18:02:21 -0400 (EDT) |
branch: master
commit c02e1bd825b702d78209e4348771d1b20d9a18db
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Follow GNU coding standards more closely
Removed '_' from
bin_dir
data_dir
src_dir
which differed gratuitously from the standards specified here:
https://www.gnu.org/prep/standards/html_node/Directory-Variables.html
because standard conformance trumps clarity.
To preserve clarity, non-standardized compounds such as 'mingw_bin_dir'
were deliberately not changed.
---
GNUmakefile | 40 ++++++++++----------
autodependency.make | 4 +-
bcc_5_5_1.make | 6 +--
como.make | 6 +--
configuration.make | 4 +-
msw_cygwin.make | 4 +-
msw_generic.make | 4 +-
objects.make | 2 +-
test_schemata.sh | 12 +++---
workhorse.make | 105 ++++++++++++++++++++++++++--------------------------
10 files changed, 93 insertions(+), 94 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 5536408..6d296d5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -79,7 +79,7 @@ MAKEFLAGS := \
# Directories.
-src_dir := $(CURDIR)
+srcdir := $(CURDIR)
################################################################################
@@ -87,15 +87,15 @@ src_dir := $(CURDIR)
# Don't remake this file.
-GNUmakefile $(src_dir)/GNUmakefile:: ;
+GNUmakefile $(srcdir)/GNUmakefile:: ;
# Included files that don't need to be remade are given explicit empty
# commands, which significantly reduces the number of lines emitted by
# 'make -d', making debug output easier to read.
#
# Included makefiles are cited by absolute pathname, e.g.
-# include $(src_dir)/included-file
-# $(src_dir)/included-file:: ;
+# include $(srcdir)/included-file
+# $(srcdir)/included-file:: ;
# An '--include-dir' option could make an absolute path unnecessary
# in the 'include' statement itself, but the empty remake command
# would not respect '--include-dir'.
@@ -109,16 +109,16 @@ GNUmakefile $(src_dir)/GNUmakefile:: ;
# Configuration.
-include $(src_dir)/configuration.make
-$(src_dir)/configuration.make:: ;
+include $(srcdir)/configuration.make
+$(srcdir)/configuration.make:: ;
# Local options.
#
# See the documentation in 'local_options.sh'. Including this file
# defines $(local_options), which is passed to submakefiles.
--include $(src_dir)/local_options.make
-$(src_dir)/local_options.make:: ;
+-include $(srcdir)/local_options.make
+$(srcdir)/local_options.make:: ;
################################################################################
@@ -131,7 +131,7 @@ $(src_dir)/local_options.make:: ;
build_type ?= ship
toolset ?= gcc
build_directory := \
- $(src_dir)/../build/$(notdir $(src_dir))/$(uname)/$(toolset)/$(build_type)
+ $(srcdir)/../build/$(notdir $(srcdir))/$(uname)/$(toolset)/$(build_type)
gpl_files := \
COPYING \
@@ -146,10 +146,10 @@ gpl_files := \
MAKETARGET = \
$(MAKE) \
--directory=$@ \
- --file=$(src_dir)/workhorse.make \
+ --file=$(srcdir)/workhorse.make \
--no-print-directory \
$(local_options) $(MAKEOVERRIDES) \
- src_dir='$(src_dir)' \
+ srcdir='$(srcdir)' \
toolset='$(toolset)' \
build_type='$(build_type)' \
platform-makefile='$(platform-makefile)' \
@@ -224,16 +224,16 @@ COPYING:
$(error Cannot build because file $@ is missing)
quoted_gpl: COPYING
- <$(src_dir)/COPYING \
- $(SED) --file=$(src_dir)/text_to_strings.sed \
+ <$(srcdir)/COPYING \
+ $(SED) --file=$(srcdir)/text_to_strings.sed \
| $(TR) --delete '\r' \
- >$(src_dir)/$@
+ >$(srcdir)/$@
quoted_gpl_html: COPYING
- <$(src_dir)/COPYING \
- $(SED) --file=$(src_dir)/text_to_html_strings.sed \
+ <$(srcdir)/COPYING \
+ $(SED) --file=$(srcdir)/text_to_html_strings.sed \
| $(TR) --delete '\r' \
- >$(src_dir)/$@
+ >$(srcdir)/$@
define gpl_notices :=
// Copyright (C) $(yyyy) Gregory W. Chicares.
@@ -288,7 +288,7 @@ distclean mostlyclean maintainer-clean: clean
.PHONY: clobber
clobber: source_clean
- -$(RM) --force --recursive $(src_dir)/../build
+ -$(RM) --force --recursive $(srcdir)/../build
################################################################################
@@ -298,7 +298,7 @@ TEST_CODING_RULES :=
$(build_directory)/test_coding_rules$(EXEEXT)
.PHONY: custom_tools
custom_tools:
- @$(MAKE) --file=$(this_makefile) --directory=$(src_dir)
test_coding_rules$(EXEEXT)
+ @$(MAKE) --file=$(this_makefile) --directory=$(srcdir)
test_coding_rules$(EXEEXT)
@$(CP) --preserve --update $(TEST_CODING_RULES) /opt/lmi/local/bin
################################################################################
@@ -451,7 +451,7 @@ happy_new_year: source_clean
# TODO ?? This is an evolving experiment. Possible enhancements include:
# - Add other tests, particularly system tests.
-# Consider using $(src_dir)/../products/src if it exists.
+# Consider using $(srcdir)/../products/src if it exists.
# Also consider using the repository only, with testdecks stored
# either there or in ftp.
# - Test skeleton branch, too.
diff --git a/autodependency.make b/autodependency.make
index 823b1ab..7bef4a3 100644
--- a/autodependency.make
+++ b/autodependency.make
@@ -23,8 +23,8 @@
# Configuration.
-include $(src_dir)/configuration.make
-$(src_dir)/configuration.make:: ;
+include $(srcdir)/configuration.make
+$(srcdir)/configuration.make:: ;
################################################################################
diff --git a/bcc_5_5_1.make b/bcc_5_5_1.make
index e678a20..6f43508 100644
--- a/bcc_5_5_1.make
+++ b/bcc_5_5_1.make
@@ -21,7 +21,7 @@
toolset := bcc
-src_dir := $(CURDIR)
+srcdir := $(CURDIR)
gcc_version :=
@@ -236,9 +236,9 @@ bcc_5_5_1.make:: ;
$(cxx_library_headers) $(cxx_c_library_headers) \
)
@-$(MAKE) \
- --file=$(src_dir)/GNUmakefile \
+ --file=$(srcdir)/GNUmakefile \
--jobs=1 \
- src_dir='$(src_dir)' \
+ srcdir='$(srcdir)' \
toolset='$(toolset)' \
gcc_version='$(gcc_version)' \
C_WARNINGS='$(C_WARNINGS)' \
diff --git a/como.make b/como.make
index 03cb0ae..88e8e8c 100644
--- a/como.make
+++ b/como.make
@@ -35,7 +35,7 @@
toolset := como
-src_dir := $(CURDIR)
+srcdir := $(CURDIR)
gcc_version :=
@@ -218,10 +218,10 @@ CXX := \
@export PATH=$(como_bin_dir):$(gcc2_bin_dir):$$PATH; \
export COMO_MIN_INCLUDE=$(gcc2_inc_dir); \
$(MAKE) \
- --file=$(src_dir)/GNUmakefile \
+ --file=$(srcdir)/GNUmakefile \
--jobs=1 \
gcc_version='$(gcc_version)' \
- src_dir='$(src_dir)' \
+ srcdir='$(srcdir)' \
toolset='$(toolset)' \
C_WARNINGS='$(C_WARNINGS)' \
CXX_WARNINGS='$(CXX_WARNINGS)' \
diff --git a/configuration.make b/configuration.make
index 95704e3..f00768f 100644
--- a/configuration.make
+++ b/configuration.make
@@ -44,8 +44,8 @@ else
endif
endif
-include $(src_dir)/$(platform-makefile)
-$(src_dir)/$(platform-makefile):: ;
+include $(srcdir)/$(platform-makefile)
+$(srcdir)/$(platform-makefile):: ;
################################################################################
diff --git a/msw_cygwin.make b/msw_cygwin.make
index 6bafb6c..5df9773 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -141,6 +141,6 @@ XMLLINT := /opt/lmi/local/bin/xmllint
# Configuration shared by all msw subplatforms.
-include $(src_dir)/msw_common.make
-$(src_dir)/msw_common.make:: ;
+include $(srcdir)/msw_common.make
+$(srcdir)/msw_common.make:: ;
diff --git a/msw_generic.make b/msw_generic.make
index f047d0d..c48e4d4 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -121,6 +121,6 @@ XMLLINT := /opt/lmi/local/bin/xmllint
# Configuration shared by all msw subplatforms.
-include $(src_dir)/msw_common.make
-$(src_dir)/msw_common.make:: ;
+include $(srcdir)/msw_common.make
+$(srcdir)/msw_common.make:: ;
diff --git a/objects.make b/objects.make
index b3f0739..6b5d658 100644
--- a/objects.make
+++ b/objects.make
@@ -988,7 +988,7 @@ rate_table_tool$(EXEEXT): \
rate_table.o \
rate_table_tool.o \
-test_coding_rules_test := PERFORM=$(PERFORM)
$(src_dir)/test_coding_rules_test.sh
+test_coding_rules_test := PERFORM=$(PERFORM)
$(srcdir)/test_coding_rules_test.sh
test_coding_rules$(EXEEXT): POST_LINK_COMMAND = $(test_coding_rules_test)
test_coding_rules$(EXEEXT): \
$(boost_filesystem_objects) \
diff --git a/test_schemata.sh b/test_schemata.sh
index eac44ac..31259be 100755
--- a/test_schemata.sh
+++ b/test_schemata.sh
@@ -25,7 +25,7 @@ echo " Test schemata..."
# Directory where this script resides.
-src_dir=$(dirname $(readlink --canonicalize $0))
+srcdir=$(dirname $(readlink --canonicalize $0))
# Directory where 'jing.jar' and 'trang.jar' reside, along with their
# support files--extracted from:
@@ -36,7 +36,7 @@ jar_dir=/opt/lmi/third_party/rng
# Data for testing.
-cp --preserve $src_dir/sample.cns $src_dir/sample.ill .
+cp --preserve $srcdir/sample.cns $srcdir/sample.ill .
# Primary schemata (RNC: RELAX NG, compact syntax).
#
@@ -46,7 +46,7 @@ cp --preserve $src_dir/sample.cns $src_dir/sample.ill .
#
# Only RNC is to be edited; XSD and RNG are generated from it.
-cp --preserve $src_dir/types.rnc $src_dir/cell.rnc
$src_dir/multiple_cell_document.rnc $src_dir/single_cell_document.rnc .
+cp --preserve $srcdir/types.rnc $srcdir/cell.rnc
$srcdir/multiple_cell_document.rnc $srcdir/single_cell_document.rnc .
echo " Test RNC files with 'jing'."
@@ -62,7 +62,7 @@ java -jar $jar_dir/jing.jar -c single_cell_document.rnc
sample.ill
# XSD, generated from RNG, is stored in the repository because it's
# widely used.
-cp --preserve $src_dir/types.xsd $src_dir/cell.xsd
$src_dir/multiple_cell_document.xsd $src_dir/single_cell_document.xsd .
+cp --preserve $srcdir/types.xsd $srcdir/cell.xsd
$srcdir/multiple_cell_document.xsd $srcdir/single_cell_document.xsd .
echo " Test XSD files with 'jing'."
@@ -187,14 +187,14 @@ echo " Regenerate XSD files as they should appear in the
repository."
# 'cell.xsd', which lacks <xs:complexType name="cell_element">, so
# process 'multiple' before 'single'.
-cp --preserve $src_dir/types_*.rnc $src_dir/cell_*.rnc
$src_dir/multiple_cell_document_*.rnc $src_dir/single_cell_document_*.rnc .
+cp --preserve $srcdir/types_*.rnc $srcdir/cell_*.rnc
$srcdir/multiple_cell_document_*.rnc $srcdir/single_cell_document_*.rnc .
java -jar $jar_dir/trang.jar multiple_cell_document.rnc
multiple_cell_document.xsd
java -jar $jar_dir/trang.jar single_cell_document.rnc
single_cell_document.xsd
java -jar $jar_dir/trang.jar multiple_cell_document_01.rnc
multiple_cell_document_01.xsd
java -jar $jar_dir/trang.jar single_cell_document_01.rnc
single_cell_document_01.xsd
sed -e 's/ *$//' -i *.xsd
-diff --unified=0 --from-file=$src_dir *.xsd || echo "Dubious '*.xsd' in
repository."
+diff --unified=0 --from-file=$srcdir *.xsd || echo "Dubious '*.xsd' in
repository."
echo " Done."
diff --git a/workhorse.make b/workhorse.make
index ba3277d..d2b4a93 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -60,22 +60,22 @@ all: effective_default_target
# Don't remake this file.
-$(src_dir)/workhorse.make:: ;
+$(srcdir)/workhorse.make:: ;
# Configuration.
-include $(src_dir)/configuration.make
-$(src_dir)/configuration.make:: ;
+include $(srcdir)/configuration.make
+$(srcdir)/configuration.make:: ;
# Automatic dependencies.
-include $(src_dir)/autodependency.make
-$(src_dir)/autodependency.make:: ;
+include $(srcdir)/autodependency.make
+$(srcdir)/autodependency.make:: ;
# Objects.
-include $(src_dir)/objects.make
-$(src_dir)/objects.make:: ;
+include $(srcdir)/objects.make
+$(srcdir)/objects.make:: ;
################################################################################
@@ -291,8 +291,8 @@ wx_config_check:
# so there's no point in calling them.
all_include_directories := \
- $(src_dir) \
- $(src_dir)/tools/pete-2.1.1 \
+ $(srcdir) \
+ $(srcdir)/tools/pete-2.1.1 \
$(overriding_include_directories) \
$(compiler_include_directory) \
$(wx_include_paths) \
@@ -302,7 +302,7 @@ all_include_directories := \
/opt/lmi/local/include/libxml2 \
all_source_directories := \
- $(src_dir) \
+ $(srcdir) \
/opt/lmi/third_party/src/boost/libs/filesystem/src \
/opt/lmi/third_party/src/boost/libs/regex/src \
/opt/lmi/third_party/src/cgicc \
@@ -314,7 +314,7 @@ vpath %.o $(CURDIR)
# which are overridden by any customized files found in a special
# directory.
-vpath my_%.cpp $(src_dir)/../products/src
+vpath my_%.cpp $(srcdir)/../products/src
vpath %.c $(all_source_directories)
vpath %.cpp $(all_source_directories)
@@ -324,10 +324,10 @@ vpath %.tpp $(all_source_directories)
vpath %.xpp $(all_source_directories)
vpath %.rc $(all_source_directories)
-vpath %.ico $(src_dir)
+vpath %.ico $(srcdir)
-vpath quoted_gpl $(src_dir)
-vpath quoted_gpl_html $(src_dir)
+vpath quoted_gpl $(srcdir)
+vpath quoted_gpl_html $(srcdir)
################################################################################
@@ -346,7 +346,7 @@ physical_closure_files := \
$(filter-out config_%.hpp pchlist%.hpp,\
$(notdir \
$(wildcard \
- $(addprefix $(src_dir)/,*.h *.hpp *.tpp *.xpp \
+ $(addprefix $(srcdir)/,*.h *.hpp *.tpp *.xpp \
) \
) \
) \
@@ -847,14 +847,13 @@ lmi_msw_res.o: lmi.ico
# different build_types and picking the latest version of each
# component can produce a mismatched set.
-# SOMEDAY !! Follow the GNU Coding Standards more closely, writing
-# bindir datadir srcdir
-# all with no '_', and changing the value of $(data_dir).
+# SOMEDAY !! Follow the GNU Coding Standards more closely,
+# e.g., changing the value of $(datadir).
prefix := /opt/lmi
exec_prefix := $(prefix)
-bin_dir := $(exec_prefix)/bin
-data_dir := $(exec_prefix)/data
+bindir := $(exec_prefix)/bin
+datadir := $(exec_prefix)/data
datarootdir := $(prefix)/share
docdir := $(datarootdir)/doc/lmi
htmldir := $(docdir)
@@ -862,25 +861,25 @@ test_dir := $(exec_prefix)/test
touchstone_dir := $(exec_prefix)/touchstone
data_files := \
- $(wildcard $(addprefix $(src_dir)/,*.ico *.png *.xml *.xrc *.xsd *.xsl)) \
+ $(wildcard $(addprefix $(srcdir)/,*.ico *.png *.xml *.xrc *.xsd *.xsl)) \
help_files := \
- $(wildcard $(addprefix $(src_dir)/,*.html)) \
+ $(wildcard $(addprefix $(srcdir)/,*.html)) \
.PHONY: install
install: $(default_targets)
address@hidden -d $(exec_prefix) ] || $(MKDIR) --parents
$(exec_prefix)
- address@hidden -d $(bin_dir) ] || $(MKDIR) --parents $(bin_dir)
- address@hidden -d $(data_dir) ] || $(MKDIR) --parents $(data_dir)
+ address@hidden -d $(bindir) ] || $(MKDIR) --parents $(bindir)
+ address@hidden -d $(datadir) ] || $(MKDIR) --parents $(datadir)
address@hidden -d $(test_dir) ] || $(MKDIR) --parents $(test_dir)
address@hidden -d $(touchstone_dir) ] || $(MKDIR) --parents
$(touchstone_dir)
- @$(CP) --preserve --update $^ $(bin_dir)
- @$(CP) --preserve --update $(data_files) $(data_dir)
- @$(CP) --preserve --update $(help_files) $(data_dir)
+ @$(CP) --preserve --update $^ $(bindir)
+ @$(CP) --preserve --update $(data_files) $(datadir)
+ @$(CP) --preserve --update $(help_files) $(datadir)
@[ -z "$(compiler_runtime_files)" ] \
|| $(CP) --preserve --update $(compiler_runtime_files)
/opt/lmi/local/bin
ifeq (,$(USE_SO_ATTRIBUTES))
- @cd $(data_dir); $(PERFORM) $(bin_dir)/product_files$(EXEEXT)
+ @cd $(datadir); $(PERFORM) $(bindir)/product_files$(EXEEXT)
else
@$(ECHO) "Can't build product_files$(EXEEXT) with USE_SO_ATTRIBUTES."
endif
@@ -908,7 +907,7 @@ shared_data_files = \
.PHONY: archive_shared_data_files
archive_shared_data_files:
- cd $(data_dir)/..; \
+ cd $(datadir)/..; \
$(TAR) \
--create \
--file=$(data_archive_name) \
@@ -952,19 +951,19 @@ fardel_date_script := \
# no others.
fardel_binaries := \
- $(bin_dir)/liblmi$(SHREXT) \
- $(bin_dir)/lmi_cli_shared$(EXEEXT) \
- $(bin_dir)/lmi_wx_shared$(EXEEXT) \
- $(bin_dir)/skeleton$(SHREXT) \
- $(bin_dir)/wx_new$(SHREXT) \
- $(bin_dir)/wx_test$(EXEEXT) \
+ $(bindir)/liblmi$(SHREXT) \
+ $(bindir)/lmi_cli_shared$(EXEEXT) \
+ $(bindir)/lmi_wx_shared$(EXEEXT) \
+ $(bindir)/skeleton$(SHREXT) \
+ $(bindir)/wx_new$(SHREXT) \
+ $(bindir)/wx_test$(EXEEXT) \
$(wildcard $(prefix)/local/bin/*$(SHREXT)) \
$(wildcard $(prefix)/local/lib/*$(SHREXT)) \
- $(wildcard $(bin_dir)/product_files$(EXEEXT)) \
+ $(wildcard $(bindir)/product_files$(EXEEXT)) \
$(extra_fardel_binaries) \
fardel_files := \
- $(addprefix $(data_dir)/,$(shared_data_files)) \
+ $(addprefix $(datadir)/,$(shared_data_files)) \
$(data_files) \
$(help_files) \
$(extra_fardel_files) \
@@ -1011,11 +1010,11 @@ fardel: install
.PHONY: wrap_fardel
wrap_fardel:
@$(CP) $(prefix)/third_party/bin/md5sum$(EXEEXT) .
- @$(CP) $(data_dir)/configurable_settings.xml .
+ @$(CP) $(datadir)/configurable_settings.xml .
@$(CP) --preserve $(fardel_binaries) $(fardel_files) .
@$(fardel_date_script)
@$(MD5SUM) --binary $(fardel_checksummed_files) >validated.md5
- @$(PERFORM) $(bin_dir)/generate_passkey > passkey
+ @$(PERFORM) $(bindir)/generate_passkey > passkey
@$(TAR) \
--bzip2 \
--create \
@@ -1042,10 +1041,10 @@ eraseme.policy:
# Test data.
-sample.cns: $(src_dir)/sample.cns
+sample.cns: $(srcdir)/sample.cns
$(CP) --preserve --update $< .
-sample.ill: $(src_dir)/sample.ill
+sample.ill: $(srcdir)/sample.ill
$(CP) --preserve --update $< .
test_data := \
@@ -1063,7 +1062,7 @@ test_data := \
# local copies are provided for as needed.
configurable_settings.xml:
- @$(CP) --preserve --update $(data_dir)/$@ .
+ @$(CP) --preserve --update $(datadir)/$@ .
################################################################################
@@ -1107,7 +1106,7 @@ run_unit_tests: unit_tests_not_built $(addsuffix
-run,$(unit_test_targets))
cli_subtargets := cli_tests_init cli_selftest $(addprefix
cli_test-,$(test_data))
-$(cli_subtargets): $(data_dir)/configurable_settings.xml
+$(cli_subtargets): $(datadir)/configurable_settings.xml
# Use '--jobs=1' to force tests to run in series: running them in
# parallel would scramble their output. Using '--output-sync=recurse'
@@ -1129,7 +1128,7 @@ cli_tests_init:
# Run the self test once, discarding the results, just to get the
# program into the disk cache. Then run it again and report results.
-self_test_options := --accept --data_path=$(data_dir) --selftest
+self_test_options := --accept --data_path=$(datadir) --selftest
.PHONY: cli_selftest
cli_selftest:
@@ -1146,13 +1145,13 @@ cli_test-%:
@$(ECHO) Test $*:
@$(PERFORM) ./lmi_cli_shared$(EXEEXT) \
--accept \
- --data_path=$(data_dir) \
+ --data_path=$(datadir) \
--emit=$(special_emission),emit_text_stream,emit_quietly,emit_timings
\
--file=$* \
| $(SED) -e '/milliseconds/!d'
@$(PERFORM) ./lmi_cli_shared$(EXEEXT) \
--accept \
- --data_path=$(data_dir) \
+ --data_path=$(datadir) \
--emit=$(special_emission),emit_text_stream,emit_quietly \
--file=$* \
>$*.touchstone
@@ -1160,7 +1159,7 @@ cli_test-%:
$(DIFF) \
--ignore-all-space \
--ignore-matching-lines='Prepared on' \
- - $(src_dir)/$*.touchstone \
+ - $(srcdir)/$*.touchstone \
| $(WC) -l \
| $(SED) -e 's/^/ /' -e 's/$$/ errors/'
@@ -1181,7 +1180,7 @@ cgi_tests: $(test_data) configurable_settings.xml
antediluvian_cgi$(EXEEXT)
--ignore-matching-lines='Prepared on' \
--ignore-matching-lines='Compiled at' \
--ignore-matching-lines=':[ 0-9]*milliseconds' \
- - $(src_dir)/cgi.touchstone \
+ - $(srcdir)/cgi.touchstone \
| $(WC) -l \
| $(SED) -e 's/^/ /' -e 's/$$/ errors/'
@@ -1261,23 +1260,23 @@ testdecks := $(wildcard $(addprefix $(test_dir)/*.,
$(testdeck_suffixes)))
.PHONY: $(testdecks)
$(testdecks):
- @-$(PERFORM) $(bin_dir)/lmi_cli_shared$(EXEEXT) \
+ @-$(PERFORM) $(bindir)/lmi_cli_shared$(EXEEXT) \
--accept \
--ash_nazg \
- --data_path=$(data_dir) \
+ --data_path=$(datadir) \
--emit=$(test_emission) \
--pyx=system_testing \
--file=$@
@$(MD5SUM) --binary $(basename $(notdir $@)).* >> $(system_test_md5sums)
@for z in $(dot_test_files); \
do \
- $(PERFORM) $(bin_dir)/ihs_crc_comp$(EXEEXT) $$z
$(touchstone_dir)/$$z \
+ $(PERFORM) $(bindir)/ihs_crc_comp$(EXEEXT) $$z
$(touchstone_dir)/$$z \
| $(SED) -e '/Summary.*max rel err/!d' -e "s/^ /$$z/" \
>> $(system_test_analysis); \
done
.PHONY: system_test
-system_test: $(data_dir)/configurable_settings.xml $(touchstone_md5sums)
install
+system_test: $(datadir)/configurable_settings.xml $(touchstone_md5sums) install
@$(ECHO) System test:
@$(RM) --force $(addprefix $(test_dir)/*., $(test_result_suffixes))
@[ "$(strip $(testdecks))" != "" ] || ( $(ECHO) No testdecks. && false )
@@ -1391,7 +1390,7 @@ show_flags:
@$(ECHO) ALL_ARFLAGS = '$(ALL_ARFLAGS)'
@$(ECHO) ALL_LDFLAGS = '$(ALL_LDFLAGS)'
@$(ECHO) ALL_RCFLAGS = '$(ALL_RCFLAGS)'
- @$(ECHO) src_dir = '$(src_dir)'
+ @$(ECHO) srcdir = '$(srcdir)'
@$(ECHO) all_include_directories = '$(all_include_directories)'
@$(ECHO) all_source_directories = '$(all_source_directories)'
@$(ECHO) wx_include_paths = '$(wx_include_paths)'