Commit 2933508f1272a24c058bbb48cad6f28772ffa939
1 parent
4c457d7f
Exists in
master
and in
1 other branch
Modificações no Makefile e no .gitignore
Showing
2 changed files
with
93 additions
and
131 deletions
Show diff stats
.gitignore
Makefile
1 | - | |
2 | -REVISION=`svn info |grep Rev | sed 2d | cut -d" " -f2` | |
3 | - | |
4 | -CC=g++ | |
5 | -FLAGS=-g | |
1 | +BIN = vlibras | |
2 | + | |
3 | +CC = g++ | |
4 | +FLAGS = -g | |
5 | + | |
6 | +EXTRATORDIR = extrator/src/ | |
7 | +INPUTDIR = input/src/ | |
8 | +MIXERDIR = mixer/src/ | |
9 | +RECOGNIZEDIR = recognize/src/ | |
10 | +RENDERDIR = renderer/src/ | |
11 | +SERVICODIR = servico/src/ | |
12 | +TRADUTORDIR = tradutor/src/ | |
13 | +UTILDIR = util/src/ | |
14 | + | |
15 | +INCLUDES = \ | |
16 | + -I $(EXTRATORDIR)include \ | |
17 | + -I $(INPUTDIR)include \ | |
18 | + -I $(MIXERDIR)include \ | |
19 | + -I $(RECOGNIZEDIR)include \ | |
20 | + -I $(RENDERDIR)include \ | |
21 | + -I $(SERVICODIR)include \ | |
22 | + -I $(TRADUTORDIR)include \ | |
23 | + -I $(UTILDIR)include \ | |
24 | + -I /usr/include/python2.7 \ | |
25 | + -I /usr/include/julius \ | |
26 | + -I /usr/include/sent | |
27 | + | |
28 | +CFLAGS = \ | |
29 | + `pkg-config --cflags jlibcpp` \ | |
30 | + `pkg-config --cflags jsoncpp` \ | |
31 | + $(INCLUDES) | |
6 | 32 | |
7 | -LIBS= \ | |
33 | +LDFLAGS = \ | |
8 | 34 | `pkg-config --libs jlibcpp` \ |
9 | 35 | `pkg-config --libs jsoncpp` \ |
10 | - -lpython2.7 -llavid_base -llavid_io -llavid_net \ | |
11 | - -ljulius -ldl -lsent | |
36 | + -lpython2.7 -llavid_base -llavid_io -llavid_net -ljulius -ldl -lsent | |
12 | 37 | |
13 | -INCLUDES= \ | |
14 | - `pkg-config --cflags jlibcpp` \ | |
15 | - `pkg-config --cflags jsoncpp` \ | |
16 | - -I /usr/include/python2.7 \ | |
17 | - -I /usr/include/julius \ | |
18 | - -I /usr/include/sent \ | |
19 | - -I util/src/include \ | |
20 | - -I tradutor/src/include \ | |
21 | - -I extrator/src/include \ | |
22 | - -I input/src/include \ | |
23 | - -I servico/src/include \ | |
24 | - -I synchronizer/src/include \ | |
25 | - -I renderer/src/include \ | |
26 | - -I mixer/src/include \ | |
27 | - -I recognize/src/include | |
28 | - | |
29 | -utilObjs= \ | |
30 | - argParser.o \ | |
31 | - logging.o \ | |
32 | - | |
33 | -tradutorObjs = \ | |
34 | - pyTradutor.o \ | |
35 | - tradutorPortGlosa.o | |
36 | - | |
37 | -extratorObjs= \ | |
38 | - extratorFactory.o \ | |
39 | - extratorSRT.o \ | |
40 | - extratorTXT.o \ | |
41 | - subtitle.o \ | |
42 | - extratorException.o | |
43 | - | |
44 | -inputObjs= \ | |
45 | - inputFile.o \ | |
46 | - inputException.o | |
47 | - | |
48 | -servicoObjs= \ | |
49 | - serviceWindowGenerationFromSRT.o \ | |
50 | - serviceWindowGenerationFromRec.o \ | |
51 | - serviceWindowGenerationFromText.o \ | |
52 | - serviceTester.o \ | |
53 | - serviceException.o | |
54 | - | |
55 | -rendererObjs= \ | |
56 | - renderer.o | |
38 | +extratorOBJS = \ | |
39 | + extratorException.o \ | |
40 | + extratorFactory.o \ | |
41 | + extratorSRT.o \ | |
42 | + extratorTXT.o \ | |
43 | + subtitle.o | |
44 | + | |
45 | +inputOBJS = \ | |
46 | + inputException.o \ | |
47 | + inputFile.o | |
57 | 48 | |
58 | -mixerObjs= \ | |
59 | - Mixer.o | |
49 | +mixerOBJS = \ | |
50 | + Mixer.o | |
60 | 51 | |
61 | -recognizeObjs = \ | |
62 | - recognize.o \ | |
52 | +recognizeOBJS = \ | |
53 | + audiofile.o \ | |
54 | + recognize.o \ | |
63 | 55 | recognizeException.o \ |
64 | - wavcut.o \ | |
65 | - audiofile.o \ | |
66 | - recognizer.o | |
67 | - | |
68 | -utilObjsPre = $(addprefix util/src/,$(utilObjs) ) | |
69 | -tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) ) | |
70 | -inputObjsPre = $(addprefix input/src/,$(inputObjs) ) | |
71 | -servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) ) | |
72 | -rendererObjsPre = $(addprefix renderer/src/,$(rendererObjs) ) | |
73 | -mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) ) | |
74 | -extratorObjsPre = $(addprefix extrator/src/,$(extratorObjs) ) | |
75 | -recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) ) | |
76 | -extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) ) | |
56 | + recognizer.o \ | |
57 | + wavcut.o | |
58 | + | |
59 | +rendererOBJS = \ | |
60 | + renderer.o | |
61 | + | |
62 | +servicoOBJS = \ | |
63 | + serviceException.o \ | |
64 | + serviceTester.o \ | |
65 | + serviceWindowGenerationFromRec.o \ | |
66 | + serviceWindowGenerationFromSRT.o \ | |
67 | + serviceWindowGenerationFromText.o | |
68 | + | |
69 | +tradutorOBJS = \ | |
70 | + pyTradutor.o \ | |
71 | + tradutorPortGlosa.o | |
72 | + | |
73 | +utilOBJS = \ | |
74 | + argParser.o \ | |
75 | + logging.o | |
76 | + | |
77 | +extratorOBJSPre = $(addprefix $(EXTRATORDIR),$(extratorOBJS) ) | |
78 | +inputOBJSPre = $(addprefix $(INPUTDIR),$(inputOBJS) ) | |
79 | +mixerOBJSPre = $(addprefix $(MIXERDIR),$(mixerOBJS) ) | |
80 | +recognizeOBJSPre = $(addprefix $(RECOGNIZEDIR),$(recognizeOBJS) ) | |
81 | +rendererOBJSPre = $(addprefix $(RENDERDIR),$(rendererOBJS) ) | |
82 | +servicoOBJSPre = $(addprefix $(SERVICODIR),$(servicoOBJS) ) | |
83 | +tradutorOBJSPre = $(addprefix $(TRADUTORDIR),$(tradutorOBJS) ) | |
84 | +utilOBJSPre = $(addprefix $(UTILDIR),$(utilOBJS) ) | |
77 | 85 | |
78 | 86 | OBJECTS = \ |
79 | - $(utilObjsPre) \ | |
80 | - $(tradutorObjsPre) \ | |
81 | - $(extratorObjsPre) \ | |
82 | - $(inputObjsPre) \ | |
83 | - $(servicoObjsPre) \ | |
84 | - $(rendererObjsPre) \ | |
85 | - $(mixerObjsPre) \ | |
86 | - $(recognizeObjsPre) \ | |
87 | - $(wavcutObjsPre) $(grecognizerObjsPre) \ | |
88 | - main.o | |
89 | - | |
90 | -all: user_config libras | |
91 | - | |
87 | + $(extratorOBJSPre) \ | |
88 | + $(inputOBJSPre) \ | |
89 | + $(mixerOBJSPre) \ | |
90 | + $(recognizeOBJSPre) \ | |
91 | + $(rendererOBJSPre) \ | |
92 | + $(servicoOBJSPre) \ | |
93 | + $(tradutorOBJSPre) \ | |
94 | + $(utilOBJSPre) \ | |
95 | + main.o | |
96 | + | |
97 | +all: user_config compile | |
98 | + | |
92 | 99 | user_config: |
93 | 100 | @if [ ! -e "vlibras_user" ];then \ |
94 | 101 | echo -n "Criando um link simbólico para este diretório...\n"; \ |
95 | 102 | sudo chmod +x link_config.sh; \ |
96 | 103 | sh link_config.sh; \ |
97 | 104 | fi |
98 | - | |
99 | -libras: $(OBJECTS) | |
100 | - $(CC) $(INCLUDES) -o vlibras $(OBJECTS) $(LIBS) $(FLAGS) | |
101 | 105 | |
102 | - | |
103 | -.c.o: $< | |
104 | - $(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LIBS) $(INCLUDES) $(FLAGS) | |
106 | +compile: $(OBJECTS) | |
107 | + $(CC) $(CFLAGS) -o $(BIN) $(OBJECTS) $(LDFLAGS) $(FLAGS) | |
105 | 108 | |
106 | 109 | .cpp.o: $< |
107 | - $(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LIBS) $(INCLUDES) $(FLAGS) | |
110 | + $(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LDFLAGS) $(CFLAGS) $(FLAGS) | |
108 | 111 | |
109 | 112 | clean: |
110 | 113 | @find -iname "*.o" -exec rm {} \; |
111 | - @find -iname ".*.o" -exec rm {} \; | |
112 | - @find -iname "*.so" -exec rm {} \; | |
113 | - @find -iname "*~" -exec rm {} \; | |
114 | - @find -iname "*.swp" -exec rm {} \; | |
115 | 114 | @find -iname "vlibras" -exec rm {} \; |
116 | - @find -iname "*.class" -exec rm {} \; | |
117 | - @find -iname "*.pyc" -exec rm {} \; | |
118 | 115 | @if [ -e "vlibras_user" ];then \ |
119 | 116 | echo -n "Removendo o link simbólico deste usuário...\n"; \ |
120 | 117 | rm vlibras_user; \ |
... | ... | @@ -127,28 +124,4 @@ clean: |
127 | 124 | |
128 | 125 | doc: |
129 | 126 | @echo -n "Gerando Documentação...\n"; \ |
130 | - doxygen doc_config | |
131 | - | |
132 | -del: | |
133 | - @find -iname "*.java" -exec rm {} \; | |
134 | - @find -iname "*.c" -exec rm {} \; | |
135 | - @find -iname "*.cpp" -exec rm {} \; | |
136 | - @find -iname "*.h" -exec rm {} \; | |
137 | - @find -iname "*.class" -exec rm {} \; | |
138 | - @find -iname "*.form" -exec rm {} \; | |
139 | - @find -iname "*.o" -exec rm {} \; | |
140 | - @find -iname ".*.o" -exec rm {} \; | |
141 | - @find -iname "*~" -exec rm {} \; | |
142 | - @find -iname "*.log" -exec rm {} \; | |
143 | - @find -iname "*.swp" -exec rm {} \; | |
144 | - @find -iname "*.tmp" -exec rm {} \; | |
145 | - @find -iname "*.svn-base" -exec rm -r {} \; | |
146 | - @find -iname "*.svn" -exec rm -r {} \; | |
147 | - @find -iname "Makefile" -exec rm {} \; | |
148 | - | |
149 | -svn: | |
150 | - @find -iname "*.log" -exec rm {} \; | |
151 | - @find -iname "*.swp" -exec rm {} \; | |
152 | - @find -iname "*.tmp" -exec rm {} \; | |
153 | - @find -iname "*.svn-base" -exec rm -r {} \; | |
154 | - @find -iname "*.svn" -exec rm -r {} ;\ | |
127 | + doxygen doc_config | |
155 | 128 | \ No newline at end of file | ... | ... |