From d46f852000642e516de69c7339601778263f1307 Mon Sep 17 00:00:00 2001
From: Wesnydy Ribeiro <wesnydy@lavid.ufpb.br>
Date: Wed, 29 Apr 2015 10:18:56 -0300
Subject: [PATCH] Atualização do Makefile

---
 Makefile | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 51 insertions(+), 35 deletions(-)

diff --git a/Makefile b/Makefile
index d4eb9b1..049dcc9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,50 +6,57 @@ FLAGS=-g
 
 #LIBS= -L libs/jthread/lib -L libs/jcommon/lib -L libs/jsocket/lib -ljthread -lpthread -ljcommon -ljsocket
 
-LIBS= `pkg-config --cflags jlibcpp` \
-	`pkg-config --libs jlibcpp` -lpython2.7 -llavid_base -llavid_io
-
-INCLUDES=-I /usr/include/python2.7 -I util/src/include -I tradutor/src/include -I extratorSRT/src/include \
--I input/src/include -I servico/src/include -I synchronizer/src/include \
--I mixer/src/include -I recognize/src/include -I extratorTXT/src/include
+LIBS= \
+	`pkg-config --cflags jlibcpp` \
+	`pkg-config --libs jlibcpp` \
+	-lpython2.7 -llavid_base -llavid_io
+
+INCLUDES= \
+ 	-I /usr/include/python2.7 \
+ 	-I util/src/include \
+ 	-I tradutor/src/include \
+ 	-I extrator/src/include \
+ 	-I input/src/include \
+ 	-I servico/src/include \
+ 	-I synchronizer/src/include \
+ 	-I mixer/src/include \
+ 	-I recognize/src/include
 #-I libs/jthread/include -I libs/jcommon/include -I libs/jsocket/include -Wall
 
-utilObjs = \
-logger.o
+utilObjs= \
+	logger.o
 
 tradutorObjs = \
-pyTradutor.o \
-tradutorPortGlosa.o \
-
-extratorSRTObjs = \
-extratorSRT.o \
-extratorSRT_exception.o \
-subtitle.o \
+ 	pyTradutor.o \
+ 	tradutorPortGlosa.o 
 
-extratorTXTObjs = \
-extratorTXT.o \
-extratorTXT_exception.o
+extratorObjs= \
+ 	extratorFactory.o \
+ 	extratorSRT.o \
+ 	extratorTXT.o \
+ 	subtitle.o \
+ 	extratorException.o
 
-inputObjs = \
-inputFile.o \
-inputException.o \
+inputObjs= \
+ 	inputFile.o \
+ 	inputException.o 
 
-servicoObjs = \
-serviceWindowGeneration.o \
-serviceWindowGenerationFromSRT.o \
-serviceWindowGenerationFromREC.o \
-serviceWindowGenerationFromText.o \
-serviceException.o
+servicoObjs= \
+ 	serviceWindowGeneration.o \
+ 	serviceWindowGenerationFromSRT.o \
+ 	serviceWindowGenerationFromREC.o \
+ 	serviceWindowGenerationFromText.o \
+ 	serviceException.o
 
-synchronizerObjs = \
-synchronizer.o \
+synchronizerObjs= \
+ 	synchronizer.o 
 
-mixerObjs = \
-Mixer.o
+mixerObjs= \
+ 	Mixer.o
 
 recognizeObjs = \
-recognize.o \
-recognizeException.o
+	recognize.o \
+ 	recognizeException.o
 
 utilObjsPre  = $(addprefix util/src/,$(utilObjs) )
 tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) )
@@ -57,11 +64,20 @@ inputObjsPre = $(addprefix input/src/,$(inputObjs) )
 servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
 synchronizerObjsPre = $(addprefix synchronizer/src/,$(synchronizerObjs) )
 mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
-extratorSRTObjsPre = $(addprefix extratorSRT/src/,$(extratorSRTObjs) )
+extratorObjsPre = $(addprefix extrator/src/,$(extratorObjs) )
 recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
 extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
 
-OBJECTS=$(utilObjsPre) $(tradutorObjsPre) $(extratorTXTObjsPre) $(inputObjsPre) $(servicoObjsPre) $(synchronizerObjsPre) $(mixerObjsPre) $(extratorSRTObjsPre) $(recognizeObjsPre) main.o
+OBJECTS = \
+	$(utilObjsPre) \
+ 	$(tradutorObjsPre) \
+ 	$(extratorObjsPre) \
+ 	$(inputObjsPre) \
+ 	$(servicoObjsPre) \
+ 	$(synchronizerObjsPre) \
+ 	$(mixerObjsPre) \
+ 	$(recognizeObjsPre) \
+ 	main.o
 
 all: user_config libras
 	
--
libgit2 0.21.2