summaryrefslogtreecommitdiffstats
path: root/science/nifticlib/files/patch-Makefile
blob: 4004521c1165ccab9fa981497f76fe0b8146cedd (plain)
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
--- Makefile.orig	2013-07-28 02:33:14.000000000 +0800
+++ Makefile	2013-07-28 02:38:08.000000000 +0800
@@ -115,34 +115,33 @@
 
 
 znz:
-	echo "arch is $(ARCH)"
-	(cd $(ZNZ); $(MAKE) depend; $(MAKE) lib;)
+	$(MAKE) -C $(ZNZ) depend lib
 	@echo " ----------- $(ZNZ) build completed."
 	@echo ""
 
 nifti:	znz
-	(cd $(NIFTI); $(MAKE) depend; $(MAKE) lib;)
+	$(MAKE) -C $(NIFTI) depend lib
 	@echo " ----------- $(NIFTI) build completed."
 	@echo ""
 
 nifticdf:nifti
-	(cd $(NIFTICDF); $(MAKE) depend; $(MAKE) lib;)
+	$(MAKE) -C $(NIFTICDF) depend lib
 	@echo " ----------- $(NIFTICDF) build completed."
 	@echo ""
 
 fslio:	nifti
-	(cd $(FSLIO); $(MAKE) depend; $(MAKE) lib;)
+	$(MAKE) -C $(FSLIO) depend lib
 	@echo " ----------  $(FSLIO) build completed."
 	@echo ""
 
 example:nifti
-	(cd $(EXAMPLES); $(MAKE) all;)
+	$(MAKE) -C $(EXAMPLES) all
 	@echo Example programs built.
 	@echo ""
 
 
 utils:  nifti nifticdf
-	(cd $(UTILS); $(MAKE) all;)
+	$(MAKE) -C $(UTILS) all
 	@echo Utility programs built.
 	@echo ""
 
@@ -152,7 +151,7 @@
 	@echo ""
 
 regress_data:
-	(cd $(TESTING); $(MAKE) regress_data 'RM=$(RM)' 'TAR=$(TAR)'; )
+	$(MAKE) -C $(TESTING) regress_data 'RM=$(RM)' 'TAR=$(TAR)'
 	@echo ""
 	@echo Regression testing data installed.
 	@echo See Testing/README_regress for details.
@@ -167,25 +166,25 @@
 $(INSTALL_LIB_DIR):
 	mkdir -p $@
 
-znz_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
+znz_install: znz $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
 	($(CP) $(ZNZ)/*.a $(INSTALL_LIB_DIR); $(CP) $(ZNZ)/*.h $(INSTALL_INC_DIR);)
 	$(RANLIB) $(INSTALL_LIB_DIR)/*.a
 	@echo " $(ZNZ) installed."
 	@echo ""
 
-nifti_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
+nifti_install: nifti $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
 	($(CP) $(NIFTI)/*.a $(INSTALL_LIB_DIR); $(CP) $(NIFTI)/*.h $(INSTALL_INC_DIR);)
 	$(RANLIB) $(INSTALL_LIB_DIR)/*.a
 	@echo " $(NIFTI) installed."
 	@echo ""
 
-nifticdf_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
+nifticdf_install: nifticdf $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
 	($(CP) $(NIFTICDF)/*.a $(INSTALL_LIB_DIR); $(CP) $(NIFTICDF)/*.h $(INSTALL_INC_DIR);)
 	$(RANLIB) $(INSTALL_LIB_DIR)/*.a
 	@echo " $(NIFTI) installed."
 	@echo ""
 
-fslio_install: $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
+fslio_install: fslio $(INSTALL_INC_DIR) $(INSTALL_LIB_DIR)
 	($(CP) $(FSLIO)/*.a $(INSTALL_LIB_DIR); $(CP) $(FSLIO)/*.h $(INSTALL_INC_DIR);)
 	$(RANLIB) $(INSTALL_LIB_DIR)/*.a
 	@echo " $(FSLIO) installed."
@@ -212,19 +211,19 @@
 	(cd $(FSLIO); $(RM) -f *.o *.a core; $(RM) -f depend.mk;)
 
 examples_clean:
-	(cd $(EXAMPLES); $(MAKE) clean;)
+	$(MAKE) -C $(EXAMPLES) clean
 
 utils_clean:
-	(cd $(UTILS); $(MAKE) clean;)
+	$(MAKE) -C $(UTILS) clean
 
 doc_clean:
 	($(RM) -fr docs/html;)
 
 regress_clean:
-	(cd $(TESTING); $(MAKE) regress_clean; )
+	$(MAKE) -C $(TESTING) regress_clean
 
 regress_clean_all:
-	(cd $(TESTING); $(MAKE) regress_clean_all; )
+	$(MAKE) -C $(TESTING) regress_clean_all
 
 tar:
 	(cd .. ; ln -s $(THIS_DIR) ${TARFILE_NAME} ; \
OpenPOWER on IntegriCloud