Download as
Browse Code »

Commit d46f852000642e516de69c7339601778263f1307

Authored by Wesnydy Ribeiro
1 parent 90ada98a
Exists in master and in 1 other branch devel

Atualização do Makefile

Showing 1 changed file with 51 additions and 35 deletions   Show diff stats
@@ -6,50 +6,57 @@ FLAGS=-g @@ -6,50 +6,57 @@ FLAGS=-g
6 6
7 #LIBS= -L libs/jthread/lib -L libs/jcommon/lib -L libs/jsocket/lib -ljthread -lpthread -ljcommon -ljsocket 7 #LIBS= -L libs/jthread/lib -L libs/jcommon/lib -L libs/jsocket/lib -ljthread -lpthread -ljcommon -ljsocket
8 8
9 -LIBS= `pkg-config --cflags jlibcpp` \  
10 - `pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io  
11 -  
12 -INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include -I extratorSRT/src/include \  
13 --I input/src/include -I servico/src/include -I synchronizer/src/include \  
14 --I mixer/src/include -I recognize/src/include -I extratorTXT/src/include 9 +LIBS= \
  10 + `pkg-config --cflags jlibcpp` \
  11 + `pkg-config --libs jlibcpp` \
  12 + -lpython2.7 -llavid_base -llavid_io
  13 +
  14 +INCLUDES= \
  15 + -I /usr/include/python2.7 \
  16 + -I util/src/include \
  17 + -I tradutor/src/include \
  18 + -I extrator/src/include \
  19 + -I input/src/include \
  20 + -I servico/src/include \
  21 + -I synchronizer/src/include \
  22 + -I mixer/src/include \
  23 + -I recognize/src/include
15 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall 24 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall
16 25
17 -utilObjs = \  
18 -logger.o 26 +utilObjs= \
  27 + logger.o
19 28
20 tradutorObjs = \ 29 tradutorObjs = \
21 -pyTradutor.o \  
22 -tradutorPortGlosa.o \  
23 -  
24 -extratorSRTObjs = \  
25 -extratorSRT.o \  
26 -extratorSRT_exception.o \  
27 -subtitle.o \ 30 + pyTradutor.o \
  31 + tradutorPortGlosa.o
28 32
29 -extratorTXTObjs = \  
30 -extratorTXT.o \  
31 -extratorTXT_exception.o 33 +extratorObjs= \
  34 + extratorFactory.o \
  35 + extratorSRT.o \
  36 + extratorTXT.o \
  37 + subtitle.o \
  38 + extratorException.o
32 39
33 -inputObjs = \  
34 -inputFile.o \  
35 -inputException.o \ 40 +inputObjs= \
  41 + inputFile.o \
  42 + inputException.o
36 43
37 -servicoObjs = \  
38 -serviceWindowGeneration.o \  
39 -serviceWindowGenerationFromSRT.o \  
40 -serviceWindowGenerationFromREC.o \  
41 -serviceWindowGenerationFromText.o \  
42 -serviceException.o 44 +servicoObjs= \
  45 + serviceWindowGeneration.o \
  46 + serviceWindowGenerationFromSRT.o \
  47 + serviceWindowGenerationFromREC.o \
  48 + serviceWindowGenerationFromText.o \
  49 + serviceException.o
43 50
44 -synchronizerObjs = \  
45 -synchronizer.o \ 51 +synchronizerObjs= \
  52 + synchronizer.o
46 53
47 -mixerObjs = \  
48 -Mixer.o 54 +mixerObjs= \
  55 + Mixer.o
49 56
50 recognizeObjs = \ 57 recognizeObjs = \
51 -recognize.o \  
52 -recognizeException.o 58 + recognize.o \
  59 + recognizeException.o
53 60
54 utilObjsPre = $(addprefix util/src/,$(utilObjs) ) 61 utilObjsPre = $(addprefix util/src/,$(utilObjs) )
55 tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) ) 62 tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) )
@@ -57,11 +64,20 @@ inputObjsPre = $(addprefix input/src/,$(inputObjs) ) @@ -57,11 +64,20 @@ inputObjsPre = $(addprefix input/src/,$(inputObjs) )
57 servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) ) 64 servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
58 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) ) 65 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) )
59 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) ) 66 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
60 -extratorSRTObjsPre = $(addprefix extratorSRT/src/,$(extratorSRTObjs) ) 67 +extratorObjsPre = $(addprefix extrator/src/,$(extratorObjs) )
61 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) ) 68 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
62 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) ) 69 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
63 70
64 -OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(recognizeObjsPre) main.o 71 +OBJECTS = \
  72 + $(utilObjsPre) \
  73 + $(tradutorObjsPre) \
  74 + $(extratorObjsPre) \
  75 + $(inputObjsPre) \
  76 + $(servicoObjsPre) \
  77 + $(synchronizerObjsPre) \
  78 + $(mixerObjsPre) \
  79 + $(recognizeObjsPre) \
  80 + main.o
65 81
66 all: user_config libras 82 all: user_config libras
67 83