[Genabel-commits] r1871 - in pkg/OmicABELnoMM: . doc examples src tests

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Tue Oct 28 17:46:49 CET 2014


Author: lckarssen
Date: 2014-10-28 17:46:48 +0100 (Tue, 28 Oct 2014)
New Revision: 1871

Added:
   pkg/OmicABELnoMM/doc/Makefile.am
   pkg/OmicABELnoMM/examples/Makefile.am
   pkg/OmicABELnoMM/src/Makefile.am
Modified:
   pkg/OmicABELnoMM/Makefile.am
   pkg/OmicABELnoMM/tests/Makefile.am
Log:
Split up the main Makefile.am of OmicABELnoMM into smaller ones, one for each subdirectory. Note that these stil constitute a non-recursive Makefile, since they are all included in the main Makefile.am.
This hopefully brings a bit of clarity in the whole makefile business.

Also contains some fixes:
- all required example files are now properly included. Some of the newer ones were not listed in the makefile and were therefore not part of the tar-ball when running 'make dist'.
- The Makefile.am in the tests/ directory now also includes the empty 'examples/results' directory into the tar-ball. This is needed in case the user runs 'make check' because tests/test.cpp doesn't create the directory if ot doesn't exist.


With these changes 'make dist' works and produces a proper tar.gz file that can be distributed to users/beta testers. 'make' and 'make install' work as expeced. However, 'make distcheck' still fails because VPATH builds don't work yet.


Modified: pkg/OmicABELnoMM/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/Makefile.am	2014-10-28 16:32:47 UTC (rev 1870)
+++ pkg/OmicABELnoMM/Makefile.am	2014-10-28 16:46:48 UTC (rev 1871)
@@ -1,245 +1,12 @@
-bin_PROGRAMS = omicabelnomm
+# This is the top Makefile.am for OmicABELnoMM. OmicABELnoMM uses a
+# non-recursive Makefile, so make sure that path names are included,
+# etc.
+# The includes below load the Automake files for the specific
+# subdirectories. Automake integrates them all in one large Makefile.
 
-oanomm_cpp = src/AIOwrapper.cpp src/Algorithm.cpp src/Utility.cpp
-oanomm_headers = $(oanomm_cpp:.cpp=.h) src/Definitions.h
+CLEANFILES =
 
-omicabelnomm_SOURCES = $(oanomm_headers) $(oanomm_cpp) src/main.cpp
-omicabelnomm_CXXFLAGS = $(AM_CXXFLAGS)
-if USE_MPI
-omicabelnomm_CXXFLAGS += -DUSE_MPI
-endif
-
-
-## Stuff needed for the checks in the tests/ directory
-check_PROGRAMS = tests/test_omicabelnomm
-#bin_PROGRAMS += tests/test_omicabelnomm
-tests_test_omicabelnomm_SOURCES =		\
- $(oanomm_headers)				\
- $(oanomm_cpp)					\
- 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 = tempAL.bin tempB.bin tempY.bin tempAR.bin	\
- $(cleanfiles_tests)
-
-
-## Specify where to store the examples data
-exampledir = $(pkgdatadir)/examples
-dist_example_DATA = examples/CreateData.R examples/XL.fvd	\
-	examples/XL.fvi  examples/XR.fvd  examples/XR.fvi	\
-	examples/Y.fvd  examples/Y.fvi
-
-
-## Stuff needed for documentation in the doc/ directory
-dist_doc_DATA = doc/howtocompile.txt doc/UserGuide.tex	\
- COPYING INSTALL ChangeLog AUTHORS
-
-## Build the PDF documentation if building of the LaTeX docs is
-## enabled via ./configure.
-if BUILD_latexdoc
-if HAVE_PDFLATEX
-DOCDIR = doc/
-MANNAME = $(DOCDIR)/UserGuide
-MANPDF = $(MANNAME).pdf
-MANTEXSRC = $(MANNAME).tex
-MANAUX = $(MANNAME).aux
-doc_DATA = $(MANPDF)
-PDFLATEXOPTS = --output-directory=$(DOCDIR)
-
-CLEANFILES += $(MANPDF) $(MANNAME).log $(MANNAME).idx $(MANNAME).out \
- $(MANNAME).toc $(MANNAME).idx $(MANNAME).ilg $(MANNAME).ind $(MANAUX) .btmp
-endif
-endif
-
-
-# Several make rules to generate the PDF from the LaTeX source
-.aux.pdf:
-	@echo === Making PDF: $@ from $^ ===
-	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
-	@while ( grep "Rerun to "			\
-		$(MANNAME).log  ); do			\
-		echo '** Re-running LaTeX **';		\
-		$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC);	\
-	done
-	if [ -f $(MANNAME).idx ]; then \
-		echo === Making index ===; \
-		makeindex $(MANNAME); \
-	fi
-	@echo === Making final PDF ===
-	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
-
-.tex.aux:
-	@echo === Making $@ file from $^ ===
-	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
-## Look for citations. Make sure grep never returns an error code.
-	@grep "^\\\\citation" $(MANAUX) > .btmp.new || true
-## If the citations are not changed, don't do anything. Otherwise replace
-## the .btmp file to make sure BibTeX will be run.
-	@if ( diff .btmp.new .btmp  > /dev/null ); then \
-		rm .btmp.new; \
-	else \
-		mv .btmp.new .btmp; \
-	fi
-
-# A target needed to keep track of the nr. of LaTeX runs
-.btmp:
+include $(srcdir)/src/Makefile.am
+include $(srcdir)/tests/Makefile.am
+include $(srcdir)/examples/Makefile.am
+include $(srcdir)/doc/Makefile.am

Added: pkg/OmicABELnoMM/doc/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/doc/Makefile.am	                        (rev 0)
+++ pkg/OmicABELnoMM/doc/Makefile.am	2014-10-28 16:46:48 UTC (rev 1871)
@@ -0,0 +1,56 @@
+# NOTE: This is not a recursive makefile. This file is to be included
+# in the top Makefile.am
+
+## Stuff needed for documentation in the doc/ directory
+dist_doc_DATA = doc/howtocompile.txt doc/UserGuide.tex	\
+ COPYING INSTALL ChangeLog AUTHORS
+
+## Build the PDF documentation if building of the LaTeX docs is
+## enabled via ./configure.
+if BUILD_latexdoc
+if HAVE_PDFLATEX
+DOCDIR = doc/
+MANNAME = $(DOCDIR)/UserGuide
+MANPDF = $(MANNAME).pdf
+MANTEXSRC = $(MANNAME).tex
+MANAUX = $(MANNAME).aux
+doc_DATA = $(MANPDF)
+PDFLATEXOPTS = --output-directory=$(DOCDIR)
+
+CLEANFILES += $(MANPDF) $(MANNAME).log $(MANNAME).idx $(MANNAME).out \
+ $(MANNAME).toc $(MANNAME).idx $(MANNAME).ilg $(MANNAME).ind $(MANAUX) .btmp
+endif
+endif
+
+
+# Several make rules to generate the PDF from the LaTeX source
+.aux.pdf:
+	@echo === Making PDF: $@ from $^ ===
+	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
+	@while ( grep "Rerun to "			\
+		$(MANNAME).log  ); do			\
+		echo '** Re-running LaTeX **';		\
+		$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC);	\
+	done
+	if [ -f $(MANNAME).idx ]; then \
+		echo === Making index ===; \
+		makeindex $(MANNAME); \
+	fi
+	@echo === Making final PDF ===
+	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
+
+.tex.aux:
+	@echo === Making $@ file from $^ ===
+	$(PDFLATEX) $(PDFLATEXOPTS) $(srcdir)/$(MANTEXSRC)
+## Look for citations. Make sure grep never returns an error code.
+	@grep "^\\\\citation" $(MANAUX) > .btmp.new || true
+## If the citations are not changed, don't do anything. Otherwise replace
+## the .btmp file to make sure BibTeX will be run.
+	@if ( diff .btmp.new .btmp  > /dev/null ); then \
+		rm .btmp.new; \
+	else \
+		mv .btmp.new .btmp; \
+	fi
+
+# A target needed to keep track of the nr. of LaTeX runs
+.btmp:

Added: pkg/OmicABELnoMM/examples/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/examples/Makefile.am	                        (rev 0)
+++ pkg/OmicABELnoMM/examples/Makefile.am	2014-10-28 16:46:48 UTC (rev 1871)
@@ -0,0 +1,55 @@
+# NOTE: This is not a recursive makefile. This file is to be included
+# in the top Makefile.am
+
+exmpldir = examples
+examplefiles = $(exmpldir)/CreateData.R		\
+ $(exmpldir)/XL.fvd				\
+ $(exmpldir)/XL.fvi				\
+ $(exmpldir)/XR.fvd				\
+ $(exmpldir)/XR.fvi				\
+ $(exmpldir)/Y.fvd				\
+ $(exmpldir)/Y.fvi				\
+ $(exmpldir)/exclude_individuals.txt		\
+ $(exmpldir)/dosages_1.txt			\
+ $(exmpldir)/dosages_2.txt
+
+intexmpldir = examples/interactions
+intexamplefiles = $(intexmpldir)/INT011.fvd	\
+ $(intexmpldir)/INT01R.fvi			\
+ $(intexmpldir)/INT11.fvd			\
+ $(intexmpldir)/INT1RR.fvi			\
+ $(intexmpldir)/INTR.fvd			\
+ $(intexmpldir)/XL.fvi				\
+ $(intexmpldir)/INT011.fvi			\
+ $(intexmpldir)/INT0.fvd			\
+ $(intexmpldir)/INT11.fvi			\
+ $(intexmpldir)/INTR0.fvd			\
+ $(intexmpldir)/INTR.fvi			\
+ $(intexmpldir)/XR.fvd				\
+ $(intexmpldir)/INT01.fvd			\
+ $(intexmpldir)/INT0.fvi			\
+ $(intexmpldir)/INT1.fvd			\
+ $(intexmpldir)/INTR0.fvi			\
+ $(intexmpldir)/INTRR.fvd			\
+ $(intexmpldir)/XR.fvi				\
+ $(intexmpldir)/INT01.fvi			\
+ $(intexmpldir)/INT10.fvd			\
+ $(intexmpldir)/INT1.fvi			\
+ $(intexmpldir)/INTR1.fvd			\
+ $(intexmpldir)/INTRR.fvi			\
+ $(intexmpldir)/Y.fvd				\
+ $(intexmpldir)/INT01R.fvd			\
+ $(intexmpldir)/INT10.fvi			\
+ $(intexmpldir)/INT1RR.fvd			\
+ $(intexmpldir)/INTR1.fvi			\
+ $(intexmpldir)/XL.fvd				\
+ $(intexmpldir)/Y.fvi
+
+
+
+## Specify where to store the example data
+exampledir = $(pkgdatadir)/examples
+dist_example_DATA = $(examplefiles)
+
+intexampledir = $(pkgdatadir)/examples/interactions
+dist_intexample_DATA = $(intexamplefiles)

Added: pkg/OmicABELnoMM/src/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/src/Makefile.am	                        (rev 0)
+++ pkg/OmicABELnoMM/src/Makefile.am	2014-10-28 16:46:48 UTC (rev 1871)
@@ -0,0 +1,13 @@
+# NOTE: This is not a recursive makefile. This file is to be included
+# in the top Makefile.am
+
+bin_PROGRAMS = omicabelnomm
+
+oanomm_cpp = src/AIOwrapper.cpp src/Algorithm.cpp src/Utility.cpp
+oanomm_headers = $(oanomm_cpp:.cpp=.h) src/Definitions.h
+
+omicabelnomm_SOURCES = $(oanomm_headers) $(oanomm_cpp) src/main.cpp
+omicabelnomm_CXXFLAGS = $(AM_CXXFLAGS)
+if USE_MPI
+omicabelnomm_CXXFLAGS += -DUSE_MPI
+endif

Modified: pkg/OmicABELnoMM/tests/Makefile.am
===================================================================
--- pkg/OmicABELnoMM/tests/Makefile.am	2014-10-28 16:32:47 UTC (rev 1870)
+++ pkg/OmicABELnoMM/tests/Makefile.am	2014-10-28 16:46:48 UTC (rev 1871)
@@ -1,11 +1,184 @@
-check_PROGRAMS = test_omicabelnomm
-bin_PROGRAMS = test_omicabelnomm
+# NOTE: This is not a recursive makefile. This file is to be included
+# in the top Makefile.am
 
-oanomm_headers = ../src/Definitions.h ../src/AIOwrapper.h ../src/Algorithm.h	\
- ../src/Utility.h
-oanomm_cpp = ../src/AIOwrapper.cpp ../src/Algorithm.cpp ../src/Utility.cpp	\
- test.cpp
 
-test_omicabelnomm_SOURCES = $(oanomm_headers) $(oanomm_cpp)
 
-TESTS = $(check_PROGRAMS)
\ No newline at end of file
+## Stuff needed for the checks in the tests/ directory
+check_PROGRAMS = tests/test_omicabelnomm
+if USE_MPI
+tests_test_omicabelnomm_CXXFLAGS = -DUSE_MPI $(AM_CXXFLAGS)
+endif
+
+# List the sources for the test binary. Also include the empty
+# directory for the results, so that it gets included in the tar-ball
+# 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).
+tests_test_omicabelnomm_SOURCES =		\
+ $(oanomm_headers)				\
+ $(oanomm_cpp)					\
+ examples/results				\
+ 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 += $(cleanfiles_tests)



More information about the Genabel-commits mailing list