Skip to content

Commit

Permalink
Small update to the Automake files: replaced a literal path in a bunc…
Browse files Browse the repository at this point in the history 
…h of file names with a variable.

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/genabel/pkg/OmicABELnoMM@1872 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
  • Loading branch information
@lckarssen
lckarssen committed Oct 28, 2014
1 parent 9eebad1 commit 58ce2f1
Show file tree
Hide file tree
Showing 2 changed files with 162 additions and 160 deletions.
5 changes: 3 additions & 2 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
# This is the top Makefile.am for OmicABELnoMM. OmicABELnoMM uses a
# non-recursive Makefile, so make sure that path names are included,
# etc.
# etc. Consequently, the order of the includes also matters w.r.t. the
# definition of variables etc.
# The includes below load the Automake files for the specific
# subdirectories. Automake integrates them all in one large Makefile.

CLEANFILES =

include $(srcdir)/src/Makefile.am
include $(srcdir)/tests/Makefile.am
include $(srcdir)/examples/Makefile.am
include $(srcdir)/tests/Makefile.am
include $(srcdir)/doc/Makefile.am
317 changes: 159 additions & 158 deletions tests/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,171 +14,172 @@ endif
# when running 'make dist'. Otherwise running 'make check' fails if
# run by the user (since the test program doesn't check for the
# directory's existence).
testresultsdir = $(exmpldir)/results
tests_test_omicabelnomm_SOURCES = \
$(oanomm_headers) \
$(oanomm_cpp) \
examples/results \
$(testresultsdir) \
tests/test.cpp

TESTS = $(check_PROGRAMS)

cleanfiles_tests = examples/results/dosages__dis.txt \
examples/results/dosages_add__dis.txt \
examples/results/dosages_dom__dis.txt \
examples/results/dosages_excl__dis.txt \
examples/results/dosages_excl_add__dis.txt \
examples/results/dosages_excl_dom__dis.txt \
examples/results/dosages_excl_myadd__dis.txt \
examples/results/dosages_excl_mylin__dis.txt \
examples/results/dosages_excl_res__dis.txt \
examples/results/dosages_myadd__dis.txt \
examples/results/dosages_mylin__dis.txt \
examples/results/dosages_res__dis.txt \
examples/results/multi_inter_011_dis.txt \
examples/results/multi_inter_0_dis.txt \
examples/results/multi_inter_10_dis.txt \
examples/results/multi_inter_11_dis.txt \
examples/results/multi_inter_1RR_dis.txt \
examples/results/multi_inter_1_dis.txt \
examples/results/multi_inter_R0_dis.txt \
examples/results/multi_inter_R1_dis.txt \
examples/results/multi_inter_R_dis.txt \
examples/results/multi_inter_add_011_dis.txt \
examples/results/multi_inter_add_0_dis.txt \
examples/results/multi_inter_add_10_dis.txt \
examples/results/multi_inter_add_11_dis.txt \
examples/results/multi_inter_add_1RR_dis.txt \
examples/results/multi_inter_add_1_dis.txt \
examples/results/multi_inter_add_R0_dis.txt \
examples/results/multi_inter_add_R1_dis.txt \
examples/results/multi_inter_add_R_dis.txt \
examples/results/multi_inter_dom_011_dis.txt \
examples/results/multi_inter_dom_0_dis.txt \
examples/results/multi_inter_dom_10_dis.txt \
examples/results/multi_inter_dom_11_dis.txt \
examples/results/multi_inter_dom_1RR_dis.txt \
examples/results/multi_inter_dom_1_dis.txt \
examples/results/multi_inter_dom_R0_dis.txt \
examples/results/multi_inter_dom_R1_dis.txt \
examples/results/multi_inter_dom_R_dis.txt \
examples/results/multi_inter_keep_R0_dis.txt \
examples/results/multi_inter_keep_RR_dis.txt \
examples/results/multi_inter_keep_R_dis.txt \
examples/results/multi_inter_keep_add_R0_dis.txt \
examples/results/multi_inter_keep_add_RR_dis.txt \
examples/results/multi_inter_keep_add_R_dis.txt \
examples/results/multi_inter_keep_dom_R0_dis.txt \
examples/results/multi_inter_keep_dom_RR_dis.txt \
examples/results/multi_inter_keep_dom_R_dis.txt \
examples/results/multi_inter_keep_myadd_R0_dis.txt \
examples/results/multi_inter_keep_myadd_RR_dis.txt \
examples/results/multi_inter_keep_myadd_R_dis.txt \
examples/results/multi_inter_keep_mylin_R0_dis.txt \
examples/results/multi_inter_keep_mylin_RR_dis.txt \
examples/results/multi_inter_keep_mylin_R_dis.txt \
examples/results/multi_inter_keep_res_R0_dis.txt \
examples/results/multi_inter_keep_res_RR_dis.txt \
examples/results/multi_inter_keep_res_R_dis.txt \
examples/results/multi_inter_myadd_011_dis.txt \
examples/results/multi_inter_myadd_0_dis.txt \
examples/results/multi_inter_myadd_10_dis.txt \
examples/results/multi_inter_myadd_11_dis.txt \
examples/results/multi_inter_myadd_1RR_dis.txt \
examples/results/multi_inter_myadd_1_dis.txt \
examples/results/multi_inter_myadd_R0_dis.txt \
examples/results/multi_inter_myadd_R1_dis.txt \
examples/results/multi_inter_myadd_R_dis.txt \
examples/results/multi_inter_mylin_011_dis.txt \
examples/results/multi_inter_mylin_0_dis.txt \
examples/results/multi_inter_mylin_10_dis.txt \
examples/results/multi_inter_mylin_11_dis.txt \
examples/results/multi_inter_mylin_1RR_dis.txt \
examples/results/multi_inter_mylin_1_dis.txt \
examples/results/multi_inter_mylin_R0_dis.txt \
examples/results/multi_inter_mylin_R1_dis.txt \
examples/results/multi_inter_mylin_R_dis.txt \
examples/results/multi_inter_res_011_dis.txt \
examples/results/multi_inter_res_0_dis.txt \
examples/results/multi_inter_res_10_dis.txt \
examples/results/multi_inter_res_11_dis.txt \
examples/results/multi_inter_res_1RR_dis.txt \
examples/results/multi_inter_res_1_dis.txt \
examples/results/multi_inter_res_R0_dis.txt \
examples/results/multi_inter_res_R1_dis.txt \
examples/results/multi_inter_res_R_dis.txt \
examples/results/normal_dis.txt \
examples/results/single_inter_011_dis.txt \
examples/results/single_inter_0_dis.txt \
examples/results/single_inter_10_dis.txt \
examples/results/single_inter_11_dis.txt \
examples/results/single_inter_1RR_dis.txt \
examples/results/single_inter_1_dis.txt \
examples/results/single_inter_R0_dis.txt \
examples/results/single_inter_R1_dis.txt \
examples/results/single_inter_R_dis.txt \
examples/results/single_inter_add_011_dis.txt \
examples/results/single_inter_add_0_dis.txt \
examples/results/single_inter_add_10_dis.txt \
examples/results/single_inter_add_11_dis.txt \
examples/results/single_inter_add_1RR_dis.txt \
examples/results/single_inter_add_1_dis.txt \
examples/results/single_inter_add_R0_dis.txt \
examples/results/single_inter_add_R1_dis.txt \
examples/results/single_inter_add_R_dis.txt \
examples/results/single_inter_dom_011_dis.txt \
examples/results/single_inter_dom_0_dis.txt \
examples/results/single_inter_dom_10_dis.txt \
examples/results/single_inter_dom_11_dis.txt \
examples/results/single_inter_dom_1RR_dis.txt \
examples/results/single_inter_dom_1_dis.txt \
examples/results/single_inter_dom_R0_dis.txt \
examples/results/single_inter_dom_R1_dis.txt \
examples/results/single_inter_dom_R_dis.txt \
examples/results/single_inter_keep_R0_dis.txt \
examples/results/single_inter_keep_RR_dis.txt \
examples/results/single_inter_keep_R_dis.txt \
examples/results/single_inter_keep_add_R0_dis.txt \
examples/results/single_inter_keep_add_RR_dis.txt \
examples/results/single_inter_keep_add_R_dis.txt \
examples/results/single_inter_keep_dom_R0_dis.txt \
examples/results/single_inter_keep_dom_RR_dis.txt \
examples/results/single_inter_keep_dom_R_dis.txt \
examples/results/single_inter_keep_myadd_R0_dis.txt \
examples/results/single_inter_keep_myadd_RR_dis.txt \
examples/results/single_inter_keep_myadd_R_dis.txt \
examples/results/single_inter_keep_mylin_R0_dis.txt \
examples/results/single_inter_keep_mylin_RR_dis.txt \
examples/results/single_inter_keep_mylin_R_dis.txt \
examples/results/single_inter_keep_res_R0_dis.txt \
examples/results/single_inter_keep_res_RR_dis.txt \
examples/results/single_inter_keep_res_R_dis.txt \
examples/results/single_inter_myadd_011_dis.txt \
examples/results/single_inter_myadd_0_dis.txt \
examples/results/single_inter_myadd_10_dis.txt \
examples/results/single_inter_myadd_11_dis.txt \
examples/results/single_inter_myadd_1RR_dis.txt \
examples/results/single_inter_myadd_1_dis.txt \
examples/results/single_inter_myadd_R0_dis.txt \
examples/results/single_inter_myadd_R1_dis.txt \
examples/results/single_inter_myadd_R_dis.txt \
examples/results/single_inter_mylin_011_dis.txt \
examples/results/single_inter_mylin_0_dis.txt \
examples/results/single_inter_mylin_10_dis.txt \
examples/results/single_inter_mylin_11_dis.txt \
examples/results/single_inter_mylin_1RR_dis.txt \
examples/results/single_inter_mylin_1_dis.txt \
examples/results/single_inter_mylin_R0_dis.txt \
examples/results/single_inter_mylin_R1_dis.txt \
examples/results/single_inter_mylin_R_dis.txt \
examples/results/single_inter_res_011_dis.txt \
examples/results/single_inter_res_0_dis.txt \
examples/results/single_inter_res_10_dis.txt \
examples/results/single_inter_res_11_dis.txt \
examples/results/single_inter_res_1RR_dis.txt \
examples/results/single_inter_res_1_dis.txt \
examples/results/single_inter_res_R0_dis.txt \
examples/results/single_inter_res_R1_dis.txt \
examples/results/single_inter_res_R_dis.txt
cleanfiles_tests = $(testresultsdir)/dosages__dis.txt \
$(testresultsdir)/dosages_add__dis.txt \
$(testresultsdir)/dosages_dom__dis.txt \
$(testresultsdir)/dosages_excl__dis.txt \
$(testresultsdir)/dosages_excl_add__dis.txt \
$(testresultsdir)/dosages_excl_dom__dis.txt \
$(testresultsdir)/dosages_excl_myadd__dis.txt \
$(testresultsdir)/dosages_excl_mylin__dis.txt \
$(testresultsdir)/dosages_excl_res__dis.txt \
$(testresultsdir)/dosages_myadd__dis.txt \
$(testresultsdir)/dosages_mylin__dis.txt \
$(testresultsdir)/dosages_res__dis.txt \
$(testresultsdir)/multi_inter_011_dis.txt \
$(testresultsdir)/multi_inter_0_dis.txt \
$(testresultsdir)/multi_inter_10_dis.txt \
$(testresultsdir)/multi_inter_11_dis.txt \
$(testresultsdir)/multi_inter_1RR_dis.txt \
$(testresultsdir)/multi_inter_1_dis.txt \
$(testresultsdir)/multi_inter_R0_dis.txt \
$(testresultsdir)/multi_inter_R1_dis.txt \
$(testresultsdir)/multi_inter_R_dis.txt \
$(testresultsdir)/multi_inter_add_011_dis.txt \
$(testresultsdir)/multi_inter_add_0_dis.txt \
$(testresultsdir)/multi_inter_add_10_dis.txt \
$(testresultsdir)/multi_inter_add_11_dis.txt \
$(testresultsdir)/multi_inter_add_1RR_dis.txt \
$(testresultsdir)/multi_inter_add_1_dis.txt \
$(testresultsdir)/multi_inter_add_R0_dis.txt \
$(testresultsdir)/multi_inter_add_R1_dis.txt \
$(testresultsdir)/multi_inter_add_R_dis.txt \
$(testresultsdir)/multi_inter_dom_011_dis.txt \
$(testresultsdir)/multi_inter_dom_0_dis.txt \
$(testresultsdir)/multi_inter_dom_10_dis.txt \
$(testresultsdir)/multi_inter_dom_11_dis.txt \
$(testresultsdir)/multi_inter_dom_1RR_dis.txt \
$(testresultsdir)/multi_inter_dom_1_dis.txt \
$(testresultsdir)/multi_inter_dom_R0_dis.txt \
$(testresultsdir)/multi_inter_dom_R1_dis.txt \
$(testresultsdir)/multi_inter_dom_R_dis.txt \
$(testresultsdir)/multi_inter_keep_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_R_dis.txt \
$(testresultsdir)/multi_inter_keep_add_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_add_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_add_R_dis.txt \
$(testresultsdir)/multi_inter_keep_dom_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_dom_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_dom_R_dis.txt \
$(testresultsdir)/multi_inter_keep_myadd_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_myadd_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_myadd_R_dis.txt \
$(testresultsdir)/multi_inter_keep_mylin_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_mylin_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_mylin_R_dis.txt \
$(testresultsdir)/multi_inter_keep_res_R0_dis.txt \
$(testresultsdir)/multi_inter_keep_res_RR_dis.txt \
$(testresultsdir)/multi_inter_keep_res_R_dis.txt \
$(testresultsdir)/multi_inter_myadd_011_dis.txt \
$(testresultsdir)/multi_inter_myadd_0_dis.txt \
$(testresultsdir)/multi_inter_myadd_10_dis.txt \
$(testresultsdir)/multi_inter_myadd_11_dis.txt \
$(testresultsdir)/multi_inter_myadd_1RR_dis.txt \
$(testresultsdir)/multi_inter_myadd_1_dis.txt \
$(testresultsdir)/multi_inter_myadd_R0_dis.txt \
$(testresultsdir)/multi_inter_myadd_R1_dis.txt \
$(testresultsdir)/multi_inter_myadd_R_dis.txt \
$(testresultsdir)/multi_inter_mylin_011_dis.txt \
$(testresultsdir)/multi_inter_mylin_0_dis.txt \
$(testresultsdir)/multi_inter_mylin_10_dis.txt \
$(testresultsdir)/multi_inter_mylin_11_dis.txt \
$(testresultsdir)/multi_inter_mylin_1RR_dis.txt \
$(testresultsdir)/multi_inter_mylin_1_dis.txt \
$(testresultsdir)/multi_inter_mylin_R0_dis.txt \
$(testresultsdir)/multi_inter_mylin_R1_dis.txt \
$(testresultsdir)/multi_inter_mylin_R_dis.txt \
$(testresultsdir)/multi_inter_res_011_dis.txt \
$(testresultsdir)/multi_inter_res_0_dis.txt \
$(testresultsdir)/multi_inter_res_10_dis.txt \
$(testresultsdir)/multi_inter_res_11_dis.txt \
$(testresultsdir)/multi_inter_res_1RR_dis.txt \
$(testresultsdir)/multi_inter_res_1_dis.txt \
$(testresultsdir)/multi_inter_res_R0_dis.txt \
$(testresultsdir)/multi_inter_res_R1_dis.txt \
$(testresultsdir)/multi_inter_res_R_dis.txt \
$(testresultsdir)/normal_dis.txt \
$(testresultsdir)/single_inter_011_dis.txt \
$(testresultsdir)/single_inter_0_dis.txt \
$(testresultsdir)/single_inter_10_dis.txt \
$(testresultsdir)/single_inter_11_dis.txt \
$(testresultsdir)/single_inter_1RR_dis.txt \
$(testresultsdir)/single_inter_1_dis.txt \
$(testresultsdir)/single_inter_R0_dis.txt \
$(testresultsdir)/single_inter_R1_dis.txt \
$(testresultsdir)/single_inter_R_dis.txt \
$(testresultsdir)/single_inter_add_011_dis.txt \
$(testresultsdir)/single_inter_add_0_dis.txt \
$(testresultsdir)/single_inter_add_10_dis.txt \
$(testresultsdir)/single_inter_add_11_dis.txt \
$(testresultsdir)/single_inter_add_1RR_dis.txt \
$(testresultsdir)/single_inter_add_1_dis.txt \
$(testresultsdir)/single_inter_add_R0_dis.txt \
$(testresultsdir)/single_inter_add_R1_dis.txt \
$(testresultsdir)/single_inter_add_R_dis.txt \
$(testresultsdir)/single_inter_dom_011_dis.txt \
$(testresultsdir)/single_inter_dom_0_dis.txt \
$(testresultsdir)/single_inter_dom_10_dis.txt \
$(testresultsdir)/single_inter_dom_11_dis.txt \
$(testresultsdir)/single_inter_dom_1RR_dis.txt \
$(testresultsdir)/single_inter_dom_1_dis.txt \
$(testresultsdir)/single_inter_dom_R0_dis.txt \
$(testresultsdir)/single_inter_dom_R1_dis.txt \
$(testresultsdir)/single_inter_dom_R_dis.txt \
$(testresultsdir)/single_inter_keep_R0_dis.txt \
$(testresultsdir)/single_inter_keep_RR_dis.txt \
$(testresultsdir)/single_inter_keep_R_dis.txt \
$(testresultsdir)/single_inter_keep_add_R0_dis.txt \
$(testresultsdir)/single_inter_keep_add_RR_dis.txt \
$(testresultsdir)/single_inter_keep_add_R_dis.txt \
$(testresultsdir)/single_inter_keep_dom_R0_dis.txt \
$(testresultsdir)/single_inter_keep_dom_RR_dis.txt \
$(testresultsdir)/single_inter_keep_dom_R_dis.txt \
$(testresultsdir)/single_inter_keep_myadd_R0_dis.txt \
$(testresultsdir)/single_inter_keep_myadd_RR_dis.txt \
$(testresultsdir)/single_inter_keep_myadd_R_dis.txt \
$(testresultsdir)/single_inter_keep_mylin_R0_dis.txt \
$(testresultsdir)/single_inter_keep_mylin_RR_dis.txt \
$(testresultsdir)/single_inter_keep_mylin_R_dis.txt \
$(testresultsdir)/single_inter_keep_res_R0_dis.txt \
$(testresultsdir)/single_inter_keep_res_RR_dis.txt \
$(testresultsdir)/single_inter_keep_res_R_dis.txt \
$(testresultsdir)/single_inter_myadd_011_dis.txt \
$(testresultsdir)/single_inter_myadd_0_dis.txt \
$(testresultsdir)/single_inter_myadd_10_dis.txt \
$(testresultsdir)/single_inter_myadd_11_dis.txt \
$(testresultsdir)/single_inter_myadd_1RR_dis.txt \
$(testresultsdir)/single_inter_myadd_1_dis.txt \
$(testresultsdir)/single_inter_myadd_R0_dis.txt \
$(testresultsdir)/single_inter_myadd_R1_dis.txt \
$(testresultsdir)/single_inter_myadd_R_dis.txt \
$(testresultsdir)/single_inter_mylin_011_dis.txt \
$(testresultsdir)/single_inter_mylin_0_dis.txt \
$(testresultsdir)/single_inter_mylin_10_dis.txt \
$(testresultsdir)/single_inter_mylin_11_dis.txt \
$(testresultsdir)/single_inter_mylin_1RR_dis.txt \
$(testresultsdir)/single_inter_mylin_1_dis.txt \
$(testresultsdir)/single_inter_mylin_R0_dis.txt \
$(testresultsdir)/single_inter_mylin_R1_dis.txt \
$(testresultsdir)/single_inter_mylin_R_dis.txt \
$(testresultsdir)/single_inter_res_011_dis.txt \
$(testresultsdir)/single_inter_res_0_dis.txt \
$(testresultsdir)/single_inter_res_10_dis.txt \
$(testresultsdir)/single_inter_res_11_dis.txt \
$(testresultsdir)/single_inter_res_1RR_dis.txt \
$(testresultsdir)/single_inter_res_1_dis.txt \
$(testresultsdir)/single_inter_res_R0_dis.txt \
$(testresultsdir)/single_inter_res_R1_dis.txt \
$(testresultsdir)/single_inter_res_R_dis.txt


CLEANFILES += $(cleanfiles_tests)

0 comments on commit 58ce2f1

Please sign in to comment.