1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
|
From: Michael R. Crusoe <crusoe@debian.org>
Subject: Enable better use of sub-make
Forwarded: https://github.com/trinityrnaseq/Inchworm/pull/1
and https://github.com/trinityrnaseq/trinity_ext_sample_data/pull/2
and https://github.com/trinityrnaseq/trinityrnaseq/pull/1091
--- trinityrnaseq.orig/Inchworm/Makefile
+++ trinityrnaseq/Inchworm/Makefile
@@ -1,8 +1,8 @@
all:
mkdir -p build
- cd build && cmake -DCMAKE_INSTALL_PREFIX="" ../ && make DESTDIR=../ install
+ cd build && cmake -DCMAKE_INSTALL_PREFIX="" ../ && $(MAKE) DESTDIR=../ install
clean:
@echo cleaning
- (cd build && make clean) || :
+ (cd build && $(MAKE) clean) || :
rm -rf ./build ./bin
--- trinityrnaseq.orig/trinity-plugins/Makefile
+++ trinityrnaseq/trinity-plugins/Makefile
@@ -28,7 +28,7 @@
bamsifter_target:
- cd bamsifter && make
+ cd bamsifter && $(MAKE)
##################################
### Needed for downstream analyses
--- trinityrnaseq.orig/trinity_ext_sample_data/test_SuperTranscript/Makefile
+++ trinityrnaseq/trinity_ext_sample_data/test_SuperTranscript/Makefile
@@ -1,9 +1,9 @@
test:
./runMe.sh
- cd indiv_tests && make test
+ cd indiv_tests && $(MAKE) test
@touch test
clean:
./cleanMe.sh
- cd indiv_tests && make clean
+ cd indiv_tests && $(MAKE) clean
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/10M/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/drosoph_denovo.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/10M/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/drosoph_denovo.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/Annotations/Drosoph_coding.cdna SAMPLES=misc_tests/drosoph_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/Annotations/Drosoph_coding.cdna SAMPLES=misc_tests/drosoph_ref.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/MOUSE_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/mouse_denovo.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/MOUSE_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/mouse_denovo.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/regev_genome_portal/RESOURCES/mouse/mm9/Annotations/mm9_ucsc_genomeStudio_genes/mm9_ucsc_genomeStudio_genes.gtf.trans.fa SAMPLES=misc_tests/mouse_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/regev_genome_portal/RESOURCES/mouse/mm9/Annotations/mm9_ucsc_genomeStudio_genes/mm9_ucsc_genomeStudio_genes.gtf.trans.fa SAMPLES=misc_tests/mouse_ref.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/SCHIZO_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel_trinity/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/schizo_denovo.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/SCHIZO_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel_trinity/trinity_out_dir/Trinity.fasta SAMPLES=misc_tests/schizo_denovo.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/PAIRED_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/home/unix/bhaas/utilities/schizo/SP2_GeneDB.290110.prot_coding.cds.nr SAMPLES=misc_tests/schizo_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/home/unix/bhaas/utilities/schizo/SP2_GeneDB.290110.prot_coding.cds.nr SAMPLES=misc_tests/schizo_ref.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/10M/trinity_out_dir/Trinity.fasta SAMPLES=drosoph.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/10M/trinity_out_dir/Trinity.fasta SAMPLES=drosoph.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Drosoph_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/Annotations/Drosoph_coding.cdna SAMPLES=misc_tests/drosoph_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/DROSOPHILA/Annotations/Drosoph_coding.cdna SAMPLES=misc_tests/drosoph_ref.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/MOUSE_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel/trinity_out_dir/Trinity.fasta SAMPLES=mouse.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/MOUSE_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel/trinity_out_dir/Trinity.fasta SAMPLES=mouse.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Mouse_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/regev_genome_portal/RESOURCES/mouse/mm9/Annotations/mm9_ucsc_genomeStudio_genes/mm9_ucsc_genomeStudio_genes.gtf.trans.fa SAMPLES=misc_tests/mouse_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/regev_genome_portal/RESOURCES/mouse/mm9/Annotations/mm9_ucsc_genomeStudio_genes/mm9_ucsc_genomeStudio_genes.gtf.trans.fa SAMPLES=misc_tests/mouse_ref.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_denovo.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_denovo.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/SCHIZO_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel_trinity/trinity_out_dir/Trinity.fasta SAMPLES=schizo.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/seq/RNASEQ/TRINITY_DEVEL_DATA/SCHIZO_RNASEQ_METHODS_ANALYSIS/10M/SS_trin_test/run_devel_trinity/trinity_out_dir/Trinity.fasta SAMPLES=schizo.samples.txt
--- trinityrnaseq.orig/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_ref.sh
+++ trinityrnaseq/trinity_ext_sample_data/test_align_and_estimate_abundance/SINGLE_END_ABUNDANCE_ESTIMATION/misc_tests/test_Schizo_ref.sh
@@ -1 +1,2 @@
-make TRINITY_FASTA=/home/unix/bhaas/utilities/schizo/SP2_GeneDB.290110.prot_coding.cds.nr SAMPLES=misc_tests/schizo_ref.samples.txt
+MAKE=${MAKE:-make}
+${MAKE} TRINITY_FASTA=/home/unix/bhaas/utilities/schizo/SP2_GeneDB.290110.prot_coding.cds.nr SAMPLES=misc_tests/schizo_ref.samples.txt
|