• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revisione270a01f6161418c5a432f79db02011aac155739 (tree)
Time2014-09-17 15:15:33
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

Modify: support to include by other tutorial Makefile
modified: TIPS/CreateGridImage/Makefile
new file: TIPS/CreateGridImage/Makefile.config

Change Summary

Incremental Difference

--- a/TIPS/CreateGridImage/Makefile
+++ b/TIPS/CreateGridImage/Makefile
@@ -1,5 +1,5 @@
11 #
2-# This is Makefile for Create Sample Image that has grid points.
2+# This is Main Makefile for Create Sample Image that has grid points.
33 #
44
55 #### Input extention ####
@@ -9,9 +9,10 @@ GRID=grid
99 TIFF=tiff
1010
1111 #### Suffixes rule ####
12-.SUFFIXES: .$(NUL) .$(ONE) .$(GRID)
12+# Defined at Sub
1313
1414 #### INCLUDE ####
15+-include Makefile.config
1516
1617 #### Definition ####
1718 ### FileData
@@ -35,27 +36,14 @@ POINT_Y=`expr $(1SIZE_Y) / 2`
3536 POINT_Z=1
3637
3738 #### Rules of the list created ####
38-
39+# Defined at Sub
3940
4041 ##### Commands #####
41-NulImage::
42- mrcImageNullImageCreate -o $(FILE_NAME).$(NUL) \
43- -Nx $(1SIZE_X) -Ny $(1SIZE_Y) -Nz $(1SIZE_Z) \
44- -v $(BACK_VALUE) -d $(LENGTH);
45-1PointImage::
46- make $(FILE_NAME).$(ONE);
47-
48-GridImage::
49- make $(FILE_NAME).$(GRID);
50-
51-Grid2Tiff::
52- mrc2tiff -i $(FILE_NAME).$(GRID) -o $(FILE_NAME).$(TIFF);
42+# Defined at Sub basically
43+all::
44+ make NulImage;
45+ make GridImage;
46+ make Grid2Tiff;
5347
5448 ##### Commands(Input to Output) #####
55-.$(NUL).$(ONE):
56- mrcImageScalarAdd -i $*.$(NUL) -o $*.$(ONE) -m 1 -v $(POINT_VALUE) \
57- -x $(POINT_X) -y $(POINT_Y) -z $(POINT_Z);
58-
59-.$(ONE).$(GRID):
60- mrcImageCrystalCreate -i $*.$(ONE) -o $*.$(GRID) \
61- -nx $(NUM_X) -ny $(NUM_Y) -nz $(NUM_Z);
49+# Defined at Sub
--- /dev/null
+++ b/TIPS/CreateGridImage/Makefile.config
@@ -0,0 +1,40 @@
1+#
2+# This is Sub Makefile for Create Sample Image that has grid points.
3+#
4+
5+#### Input extention ####
6+# Defined at Main
7+
8+#### Suffixes rule ####
9+.SUFFIXES: .$(NUL) .$(ONE) .$(GRID)
10+
11+#### INCLUDE ####
12+
13+#### Definition ####
14+# Defined at Main
15+
16+#### Rules of the list created ####
17+
18+
19+##### Commands #####
20+NulImage::
21+ mrcImageNullImageCreate -o $(FILE_NAME).$(NUL) \
22+ -Nx $(1SIZE_X) -Ny $(1SIZE_Y) -Nz $(1SIZE_Z) \
23+ -v $(BACK_VALUE) -d $(LENGTH);
24+1PointImage::
25+ make $(FILE_NAME).$(ONE);
26+
27+GridImage::
28+ make $(FILE_NAME).$(GRID);
29+
30+Grid2Tiff::
31+ mrc2tiff -i $(FILE_NAME).$(GRID) -o $(FILE_NAME).$(TIFF);
32+
33+##### Commands(Input to Output) #####
34+.$(NUL).$(ONE):
35+ mrcImageScalarAdd -i $*.$(NUL) -o $*.$(ONE) -m 1 -v $(POINT_VALUE) \
36+ -x $(POINT_X) -y $(POINT_Y) -z $(POINT_Z);
37+
38+.$(ONE).$(GRID):
39+ mrcImageCrystalCreate -i $*.$(ONE) -o $*.$(GRID) \
40+ -nx $(NUM_X) -ny $(NUM_Y) -nz $(NUM_Z);
Show on old repository browser