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
|
From: Sebastian Ramacher <sramacher@debian.org>
Date: Sat, 23 Nov 2019 13:54:41 +0100
Subject: Trap errors
---
Makefile | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 88221f6..0789f8b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ all : config
#@build resource file
resources : resource.xml
@echo $(LGREEN)"generate resource file,"$(NONE)
- -@glib-compile-resources --target=resources.c --generate-source resource.xml
- -@glib-compile-resources --target=resources.h --generate-header resource.xml
+ glib-compile-resources --target=resources.c --generate-source resource.xml
+ glib-compile-resources --target=resources.h --generate-header resource.xml
#@build without jack session support
nosession : nconf
@@ -49,7 +49,7 @@ nosession : nconf
link : $(OBJS)
@rm -rf $(NAME)
@echo $(BROWN)
- - $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJS) $(LIBS) -o $(NAME)
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) $(OBJS) $(LIBS) -o $(NAME)
#@check if build have worked
check : link
@@ -59,7 +59,7 @@ check : link
#@create resampler.h to set the used zita-resamper version
resamp :
- -@if [ -f ./resample.h ] ; then \
+ @if [ -f ./resample.h ] ; then \
echo ''; else \
if [ -f $(INCLUDE_DIR)zita-resampler/resampler.h 2>/dev/null ]; then \
echo '#include <zita-resampler/resampler.h>' > resample.h; else \
@@ -75,7 +75,7 @@ resamp :
#@create config.h for build with jack session support
config : resamp
- -@if cat config.h 2>/dev/null | grep HAVE_JACK_SESSION >/dev/null; then \
+ @if cat config.h 2>/dev/null | grep HAVE_JACK_SESSION >/dev/null; then \
echo ''; else \
echo '#define VERSION "$(VER)"' > config.h ;\
echo '#define PIXMAPS_DIR "$(PIXMAPS_DIR)"' >> config.h ;\
@@ -88,7 +88,7 @@ config : resamp
#@create config.h for build without jack session support
nconf : resamp
- -@if [ -f ./config.h 2>/dev/null ] ; then \
+ @if [ -f ./config.h 2>/dev/null ] ; then \
if cat config.h 2>/dev/null | grep HAVE_JACK_SESSION >/dev/null; then \
echo '#define VERSION "$(VER)"' > config.h ;\
echo '#define PIXMAPS_DIR "$(PIXMAPS_DIR)"' >> config.h ;\
@@ -102,43 +102,43 @@ nconf : resamp
#@build object files
resources.o : resources.c resources.h
@rm -rf resources.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c resources.c
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c resources.c
jacktuner.o : jacktuner.cpp jacktuner.h config.h
@rm -rf jacktuner.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c jacktuner.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c jacktuner.cpp
gxtuner.o : gxtuner.cpp gxtuner.h
@rm -rf gxtuner.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gxtuner.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gxtuner.cpp
cmdparser.o : cmdparser.cpp cmdparser.h config.h
@rm -rf cmdparser.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) -c cmdparser.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) -c cmdparser.cpp
gx_pitch_tracker.o : gx_pitch_tracker.cpp gx_pitch_tracker.h resample.h
@rm -rf gx_pitch_tracker.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gx_pitch_tracker.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gx_pitch_tracker.cpp
gtkknob.o : gtkknob.cc gtkknob.h
@rm -rf gtkknob.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gtkknob.cc
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c gtkknob.cc
tuner.o :tuner.cpp tuner.h config.h paintbox.h gtkknob.h gxtuner.h deskpager.h
@rm -rf tuner.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c tuner.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c tuner.cpp
paintbox.o : paintbox.cpp paintbox.h
@rm -rf paintbox.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c paintbox.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c paintbox.cpp
deskpager.o : deskpager.cpp deskpager.h
@rm -rf deskpager.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c deskpager.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c deskpager.cpp
main.o : main.cpp jacktuner.h gxtuner.h cmdparser.h gx_pitch_tracker.h tuner.h deskpager.h
@rm -rf main.o
- -$(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c main.cpp
+ $(CXX) $(LDFLAGS) $(CFLAGS) $(CPPFLAGS) -c main.cpp
#@install all
install :
|
