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
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
|
Description: makefiles: use $(MAKE)
Avoids warnings like this:
make[3]: warning: jobserver unavailable: using -j1. Add '+' to parent make rule.
Adding '+' to parent make rule is unnecessary if $(MAKE) is used.
This is best practice for GNU make:
https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html
Author: Juhani Numminen <juhaninumminen0@gmail.com>
Forwarded: https://sourceforge.net/p/biosig/code/merge-requests/3/
Last-Update: 2021-01-13
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,42 +11,42 @@
first :: lib tools
java: lib
- make -C biosig4c++/java
+ $(MAKE) -C biosig4c++/java
python: lib
- make -C biosig4c++/python
+ $(MAKE) -C biosig4c++/python
lib:
- make -C biosig4c++ lib
+ $(MAKE) -C biosig4c++ lib
tools: lib
- make -C biosig4c++ tools
+ $(MAKE) -C biosig4c++ tools
mma mathematica: lib
- make -C biosig4c++/mma
+ $(MAKE) -C biosig4c++/mma
mex4m matlab: lib
- make -C biosig4c++/mex mex4m
+ $(MAKE) -C biosig4c++/mex mex4m
mex4o octave: lib
- make -C biosig4c++/mex mex4o
+ $(MAKE) -C biosig4c++/mex mex4o
R: lib
- make -C biosig4c++/R
+ $(MAKE) -C biosig4c++/R
install ::
- make -C biosig4c++ install
+ $(MAKE) -C biosig4c++ install
install -d $(DESTDIR)@prefix@/share/biosig/matlab
cp -r biosig4matlab/* $(DESTDIR)@prefix@/share/biosig/matlab/
-rm -rf $(DESTDIR)@prefix@/share/biosig/matlab/maybe-missing
uninstall ::
- make -C biosig4c++ uninstall
+ $(MAKE) -C biosig4c++ uninstall
-rm -rf $(DESTDIR)@prefix@/share/biosig
clean ::
- make -C biosig4c++/mma clean
- make -C biosig4c++ clean
+ $(MAKE) -C biosig4c++/mma clean
+ $(MAKE) -C biosig4c++ clean
distclean : clean
# also configure.ac for list of files
@@ -57,31 +57,31 @@
ifneq (:,@JAVA@)
ifneq (:,@JAVAC@)
first :: lib
- -make -C biosig4c++/java
+ -$(MAKE) -C biosig4c++/java
endif
clean ::
- -make -C biosig4c++/java clean
+ -$(MAKE) -C biosig4c++/java clean
test ::
- -make -C biosig4c++/java test
+ -$(MAKE) -C biosig4c++/java test
endif
ifneq (:,@MATHEMATICA@)
first :: lib
- make -C biosig4c++/mma
+ $(MAKE) -C biosig4c++/mma
install ::
- -make -C biosig4c++/mma install
+ -$(MAKE) -C biosig4c++/mma install
uninstall ::
- -make -C biosig4c++/mma uninstall
+ -$(MAKE) -C biosig4c++/mma uninstall
endif
ifneq (:,@MATLAB@)
MATLAB_MEX := $(shell dirname @MATLAB@)/mex
first ::
- make -C biosig4c++/mex mex4m
+ $(MAKE) -C biosig4c++/mex mex4m
install ::
- make -C biosig4c++/mex install
+ $(MAKE) -C biosig4c++/mex install
uninstall ::
- make -C biosig4c++/mex uninstall
+ $(MAKE) -C biosig4c++/mex uninstall
endif
ifneq (:,@OCTAVE@)
@@ -89,8 +89,8 @@
BIOSIG_MEX_DIR = $(DESTDIR)$(shell octave-config -p LOCALOCTFILEDIR)/biosig
BIOSIG_DIR = $(DESTDIR)$(shell octave-config -p LOCALFCNFILEDIR)/biosig
first ::
- make octave
- make -C biosig4c++ mexbiosig
+ $(MAKE) octave
+ $(MAKE) -C biosig4c++ mexbiosig
install ::
# mexbiosig
#-@OCTAVE@ --no-gui --eval "pkg install -global biosig4c++/mex/mexbiosig-@PACKAGE_VERSION@.src.tar.gz"
@@ -114,7 +114,7 @@
ifneq (:,@PYTHON3@)
first biosig4c++/python/dist/Biosig-@PACKAGE_VERSION@.tar.gz ::
- -PYTHON=@PYTHON3@ make -C biosig4c++/python dist/Biosig-@PACKAGE_VERSION@.tar.gz
+ -PYTHON=@PYTHON3@ $(MAKE) -C biosig4c++/python dist/Biosig-@PACKAGE_VERSION@.tar.gz
install :: biosig4c++/python/dist/Biosig-@PACKAGE_VERSION@.tar.gz
-@PYTHON3@ -m pip install $<
-$(foreach py, $(shell pyversions -i), $(py) -m pip install $<;)
@@ -124,16 +124,16 @@
-$(foreach py, $(shell pyversions -i), $(py) -m pip uninstall -y Biosig;)
-$(foreach py, $(shell py3versions -i), $(py) -m pip uninstall -y Biosig;)
clean ::
- make -C biosig4c++/python clean
+ $(MAKE) -C biosig4c++/python clean
endif
ifneq (:,@R@)
first ::
- -make -C biosig4c++/R build
+ -$(MAKE) -C biosig4c++/R build
install ::
- -make -C biosig4c++/R install
+ -$(MAKE) -C biosig4c++/R install
clean ::
- -make -C biosig4c++/R clean
+ -$(MAKE) -C biosig4c++/R clean
endif
all: first #win32 win64 #sigviewer #win32/sigviewer.exe win64/sigviewer.exe #biosig_client biosig_server mma java tcl perl php ruby #sigviewer
--- a/biosig4c++/Makefile.in
+++ b/biosig4c++/Makefile.in
@@ -601,7 +601,7 @@
-$(COPY) win32/libbiosig.a $(PathToSigViewerWIN32)/extern/lib
$(SED) -i 's|\([[:space:]]*-lbiosig\)\([ #\\]*\)$$|\1 -lcholmod -lz -lcurl \2|' $(PathToSigViewerWIN32)/src/src.pro
echo 0.5.2-v${BIOSIG_VERSION} > $(PathToSigViewerWIN32)/src/version.txt
- -(cd $(PathToSigViewerWIN32)/src; $(CROSS)-qmake; make)
+ -(cd $(PathToSigViewerWIN32)/src; $(CROSS)-qmake; $(MAKE))
#-(cd $(PathToSigViewerWIN32); svn revert -R .; svn up -r 557; patch -p0 <../biosig4c++/patches/patch_sigviewer_0.5.2.diff; cd src; $(CROSS)-qmake; $(MAKE);)
-$(COPY) $(PathToSigViewerWIN32)/bin/release/sigviewer.exe win32/sigviewer.exe
@@ -624,7 +624,7 @@
-$(COPY) win64/libbiosig.a $(PathToSigViewerWIN64)/extern/lib
$(SED) -i 's|\([[:space:]]*-lbiosig\)\([ #\\]*\)$$|\1 -lcholmod -lz -lcurl\2|' $(PathToSigViewerWIN64)/src/src.pro
echo 0.5.2-v${MAJOR_VERSION}.${MINOR_VERSION}.${STEPPING} > $(PathToSigViewerWIN64)/src/version.txt
- -(cd $(PathToSigViewerWIN64)/src; $(CROSS64)-qmake; make)
+ -(cd $(PathToSigViewerWIN64)/src; $(CROSS64)-qmake; $(MAKE))
#-(cd $(PathToSigViewerWIN64); svn revert -R .; svn up -r 557; patch -p0 <../biosig4c++/patches/patch_sigviewer_0.5.2.diff; cd src; $(CROSS64)-qmake; $(MAKE);)
-$(COPY) $(PathToSigViewerWIN64)/bin/release/sigviewer.exe win64/sigviewer.exe
@@ -798,10 +798,10 @@
#############################################################
mex4o mex4m oct mex:
- make -C mex $@
+ $(MAKE) -C mex $@
mexw32 mexw64:
- CROSS=$(CROSS) CROSS64=$(CROSS64) make -C mex $@
+ CROSS=$(CROSS) CROSS64=$(CROSS64) $(MAKE) -C mex $@
mexbiosig: mex/mexbiosig-$(BIOSIG_VERSION).src.tar.gz
@@ -831,7 +831,7 @@
R: R/sload.$(DLEXT)
R/sload.$(DLEXT): R/sload.c libbiosig.$(DLEXT)
- make -C R
+ $(MAKE) -C R
#############################################################
@@ -986,10 +986,10 @@
### Install mexbiosig for Matlab and Octave
install_mex:
- make -C mex install
+ $(MAKE) -C mex install
uninstall_mex:
- make -C mex uninstall
+ $(MAKE) -C mex uninstall
uninstall remove: uninstall_mexbiosig uninstall_tools
-$(DELETE) $(DESTDIR)$(bindir)/ttl2trig
--- a/biosig4c++/python/Makefile.in
+++ b/biosig4c++/python/Makefile.in
@@ -22,7 +22,7 @@
test:
## get ../data/Newtest17-256.bdf
- make -C .. fetchdata
+ $(MAKE) -C .. fetchdata
## need to run from different directory, because
(cd .. && PYTHONPATH=/usr/local/lib/python$(PYVER)/dist-packages/ $(PYTHON) -c 'import biosig; print(biosig.header("data/Newtest17-256.bdf"))')
(cd .. && PYTHONPATH=/usr/local/lib/python$(PYVER)/dist-packages/ $(PYTHON) -c 'import biosig; print(biosig.data("data/Newtest17-256.bdf"))')
--- a/biosig4c++/Makefile.win32
+++ b/biosig4c++/Makefile.win32
@@ -262,7 +262,7 @@
# #asn1c -fcompound-names iso11073-10471.asn1
# #asn1c -fcompound-names iso11073-20601.asn1
# cd ..
-# make -C t240 -f Makefile.am.sample
+# $(MAKE) -C t240 -f Makefile.am.sample
$(CC) -c $(CFLAGS) -I t240 $(INCPATH) -o "$@" "$<"
sopen_hl7aecg.o: t230/sopen_hl7aecg.c biosig-dev.h biosig.h XMLParser/tinyxml.h XMLParser/tinystr.h
@@ -325,17 +325,17 @@
java: libbiosig.$(LIBEXT) java/biosig.i
- make -C java
+ $(MAKE) -C java
perl: libbiosig.$(LIBEXT) perl/biosig.i
- make -C perl
+ $(MAKE) -C perl
php: libbiosig.$(LIBEXT) php/biosig.i
- make -C php
+ $(MAKE) -C php
python: libbiosig.$(LIBEXT) python/swig.i
- make -C python
+ $(MAKE) -C python
ruby: libbiosig.$(LIBEXT) ruby/biosig.i
- make -C ruby
+ $(MAKE) -C ruby
tcl: libbiosig.$(LIBEXT) tcl/biosig.i
- make -C tcl
+ $(MAKE) -C tcl
#############################################################
@@ -370,8 +370,8 @@
#############################################################
t240/libcnsfef.a:
-# make -C t240 regen #
- make -C t240 libcnsfef.a # generate t240/*.o files
+# $(MAKE) -C t240 regen #
+ $(MAKE) -C t240 libcnsfef.a # generate t240/*.o files
libbiosig.a: $(OBJECTS) biosig.h biosig-dev.h #t240/libcnsfef.a
-$(DELETE) libbiosig.a
@@ -404,22 +404,22 @@
# MathLink interface to Mathematica
#############################################################
mma: libbiosig.a
- make -C mma -f Makefile.win32
+ $(MAKE) -C mma -f Makefile.win32
mex mex4m mex4o mexw32 oct:
- make -C mex $@
+ $(MAKE) -C mex $@
#############################################################
# MEX-files for Octave and Matlab
#############################################################
mex:
- make -C mex mex -k
+ $(MAKE) -C mex mex -k
mex mex4m mex4o mexw32 oct:
- make -C mex $@
+ $(MAKE) -C mex $@
%.mex %.mex.$(MEX_EXT) %.mexw32:
- make -C mex $@
+ $(MAKE) -C mex $@
#############################################################
# SigViewer
@@ -471,13 +471,13 @@
-$(DELETE) t240/libbiosig.*
-$(DELETE) t240/*.obj
-$(DELETE) pdp2gdf
- -make -C java clean
- -make -C matlab clean
- -make -C mma clean
- -make -C php clean
- -make -C perl clean
- -make -C ruby clean
- -make -C tcl clean
+ -$(MAKE) -C java clean
+ -$(MAKE) -C matlab clean
+ -$(MAKE) -C mma clean
+ -$(MAKE) -C php clean
+ -$(MAKE) -C perl clean
+ -$(MAKE) -C ruby clean
+ -$(MAKE) -C tcl clean
install_sigviewer: sigviewer
install $(PathToSigViewer)/bin/sigviewer $(BIN)
--- a/biosig4c++/mma/Makefile.win32
+++ b/biosig4c++/mma/Makefile.win32
@@ -23,10 +23,10 @@
all : sload.exe
win win32 :
- make -f Makefile.win32
+ $(MAKE) -f Makefile.win32
../libbiosig.a:
- make -C .. -f Makefile.win32 libbiosig.a
+ $(MAKE) -C .. -f Makefile.win32 libbiosig.a
.c.o :
${CC} -c -I${INCDIR} $<
--- a/biosig4c++/ruby/Makefile.in
+++ b/biosig4c++/ruby/Makefile.in
@@ -14,7 +14,7 @@
$(error support for biosig on ruby is not ready yet)
swig -c++ -ruby biosig.i
ruby extconf.rb
- make
+ $(MAKE)
clean:
-rm *.cxx
|
