From 2933508f1272a24c058bbb48cad6f28772ffa939 Mon Sep 17 00:00:00 2001
From: Wesnydy Ribeiro <wesnydy@lavid.ufpb.br>
Date: Wed, 14 Oct 2015 10:13:16 -0300
Subject: [PATCH] Modificações no Makefile e no .gitignore

---
 .gitignore |  11 -----------
 Makefile   | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------
 2 files changed, 93 insertions(+), 131 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb97562..1ee9edf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,5 @@
 #general
-*.ts
-*.flv
-*.swp*
-*.class
-*.a
-*.so
 *.o
-*.log
-*.jar
-*.pyc
-*.srt
 vlibras_user
-tamanho.txt
 vlibras
 doc
\ No newline at end of file
diff --git a/Makefile b/Makefile
index e8fa63b..9acd363 100644
--- a/Makefile
+++ b/Makefile
@@ -1,120 +1,117 @@
-	
-REVISION=`svn info |grep Rev | sed 2d | cut -d" " -f2`
-
-CC=g++
-FLAGS=-g
+BIN = vlibras
+
+CC = g++
+FLAGS = -g
+
+EXTRATORDIR  = extrator/src/
+INPUTDIR     = input/src/
+MIXERDIR     = mixer/src/
+RECOGNIZEDIR = recognize/src/
+RENDERDIR    = renderer/src/
+SERVICODIR   = servico/src/
+TRADUTORDIR  = tradutor/src/
+UTILDIR      = util/src/
+
+INCLUDES = \
+ 	-I $(EXTRATORDIR)include  \
+ 	-I $(INPUTDIR)include     \
+ 	-I $(MIXERDIR)include     \
+	-I $(RECOGNIZEDIR)include \
+ 	-I $(RENDERDIR)include    \
+ 	-I $(SERVICODIR)include   \
+ 	-I $(TRADUTORDIR)include  \
+	-I $(UTILDIR)include      \
+	-I /usr/include/python2.7 \
+ 	-I /usr/include/julius    \
+ 	-I /usr/include/sent
+
+CFLAGS = \
+	`pkg-config --cflags jlibcpp` \
+	`pkg-config --cflags jsoncpp` \
+	$(INCLUDES)
 
-LIBS= \
+LDFLAGS = \
 	`pkg-config --libs jlibcpp` \
 	`pkg-config --libs jsoncpp` \
-	-lpython2.7 -llavid_base -llavid_io -llavid_net \
-	-ljulius -ldl -lsent
+	-lpython2.7 -llavid_base -llavid_io -llavid_net -ljulius -ldl -lsent
 
-INCLUDES= \
-	`pkg-config --cflags jlibcpp` \
-	`pkg-config --cflags jsoncpp` \
- 	-I /usr/include/python2.7 \
- 	-I /usr/include/julius \
- 	-I /usr/include/sent \
- 	-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 renderer/src/include \
- 	-I mixer/src/include \
- 	-I recognize/src/include 
-
-utilObjs= \
-	argParser.o \
-	logging.o \
-
-tradutorObjs = \
- 	pyTradutor.o \
- 	tradutorPortGlosa.o 
-
-extratorObjs= \
- 	extratorFactory.o \
- 	extratorSRT.o \
- 	extratorTXT.o \
- 	subtitle.o \
- 	extratorException.o
-
-inputObjs= \
- 	inputFile.o \
- 	inputException.o 
-
-servicoObjs= \
- 	serviceWindowGenerationFromSRT.o \
- 	serviceWindowGenerationFromRec.o \
- 	serviceWindowGenerationFromText.o \
- 	serviceTester.o \
- 	serviceException.o
-
-rendererObjs= \
-	renderer.o
+extratorOBJS = \
+	extratorException.o \
+	extratorFactory.o   \
+	extratorSRT.o       \
+	extratorTXT.o       \
+	subtitle.o
+
+inputOBJS = \
+	inputException.o \
+	inputFile.o
 
-mixerObjs= \
- 	Mixer.o
+mixerOBJS = \
+	Mixer.o
 
-recognizeObjs = \
-	recognize.o \
+recognizeOBJS = \
+	audiofile.o          \
+	recognize.o          \
  	recognizeException.o \
- 	wavcut.o \
- 	audiofile.o \
- 	recognizer.o
-
-utilObjsPre  = $(addprefix util/src/,$(utilObjs) )
-tradutorObjsPre = $(addprefix tradutor/src/,$(tradutorObjs) )
-inputObjsPre = $(addprefix input/src/,$(inputObjs) )
-servicoObjsPre = $(addprefix servico/src/,$(servicoObjs) )
-rendererObjsPre = $(addprefix renderer/src/,$(rendererObjs) )
-mixerObjsPre = $(addprefix mixer/src/,$(mixerObjs) )
-extratorObjsPre = $(addprefix extrator/src/,$(extratorObjs) )
-recognizeObjsPre = $(addprefix recognize/src/,$(recognizeObjs) )
-extratorTXTObjsPre = $(addprefix extratorTXT/src/,$(extratorTXTObjs) )
+ 	recognizer.o         \
+ 	wavcut.o
+
+rendererOBJS = \
+	renderer.o
+
+servicoOBJS = \
+	serviceException.o                \
+	serviceTester.o                   \
+ 	serviceWindowGenerationFromRec.o  \
+ 	serviceWindowGenerationFromSRT.o  \
+ 	serviceWindowGenerationFromText.o
+
+tradutorOBJS = \
+	pyTradutor.o \
+	tradutorPortGlosa.o
+
+utilOBJS = \
+	argParser.o \
+	logging.o
+
+extratorOBJSPre  = $(addprefix $(EXTRATORDIR),$(extratorOBJS) )
+inputOBJSPre     = $(addprefix $(INPUTDIR),$(inputOBJS) )
+mixerOBJSPre     = $(addprefix $(MIXERDIR),$(mixerOBJS) )
+recognizeOBJSPre = $(addprefix $(RECOGNIZEDIR),$(recognizeOBJS) )
+rendererOBJSPre  = $(addprefix $(RENDERDIR),$(rendererOBJS) )
+servicoOBJSPre   = $(addprefix $(SERVICODIR),$(servicoOBJS) )
+tradutorOBJSPre  = $(addprefix $(TRADUTORDIR),$(tradutorOBJS) )
+utilOBJSPre      = $(addprefix $(UTILDIR),$(utilOBJS) )
 
 OBJECTS = \
-	$(utilObjsPre) \
- 	$(tradutorObjsPre) \
- 	$(extratorObjsPre) \
- 	$(inputObjsPre) \
- 	$(servicoObjsPre) \
- 	$(rendererObjsPre) \
- 	$(mixerObjsPre) \
- 	$(recognizeObjsPre) \
- 	$(wavcutObjsPre) $(grecognizerObjsPre) \
- 	main.o
-
-all: user_config libras
-	
+	$(extratorOBJSPre)  \
+	$(inputOBJSPre)     \
+	$(mixerOBJSPre)     \
+	$(recognizeOBJSPre) \
+	$(rendererOBJSPre)  \
+	$(servicoOBJSPre)   \
+	$(tradutorOBJSPre)  \
+	$(utilOBJSPre)      \
+	main.o
+
+all: user_config compile
+
 user_config:
 	@if [ ! -e "vlibras_user" ];then \
 		echo -n "Criando um link simbólico para este diretório...\n"; \
 		sudo chmod +x link_config.sh; \
 		sh link_config.sh; \
 	fi
-	
-libras: $(OBJECTS)
-	$(CC) $(INCLUDES) -o vlibras $(OBJECTS) $(LIBS) $(FLAGS)
 
-
-.c.o: $<
-	$(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LIBS) $(INCLUDES) $(FLAGS)
+compile: $(OBJECTS)
+	$(CC) $(CFLAGS) -o $(BIN) $(OBJECTS) $(LDFLAGS) $(FLAGS)
 
 .cpp.o: $<
-	$(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LIBS) $(INCLUDES) $(FLAGS)
+	$(CC) -DDEBUG_LEVEL=15 -c $< -o $@ $(LDFLAGS) $(CFLAGS) $(FLAGS)
 
 clean:
 	@find -iname "*.o" -exec rm {} \;
-	@find -iname ".*.o" -exec rm {} \;
-	@find -iname "*.so" -exec rm {} \;
-	@find -iname "*~" -exec rm {} \;
-	@find -iname "*.swp" -exec rm {} \;
 	@find -iname "vlibras" -exec rm {} \;
-	@find -iname "*.class" -exec rm {} \;
-	@find -iname "*.pyc" -exec rm {} \;
 	@if [ -e "vlibras_user" ];then \
 		echo -n "Removendo o link simbólico deste usuário...\n"; \
 		rm vlibras_user; \
@@ -127,28 +124,4 @@ clean:
 	
 doc:
 	@echo -n "Gerando Documentação...\n"; \
-	doxygen doc_config
-		
-del:
-	@find -iname "*.java" -exec rm {} \;
-	@find -iname "*.c" -exec rm {} \;
-	@find -iname "*.cpp" -exec rm {} \;
-	@find -iname "*.h" -exec rm {} \;
-	@find -iname "*.class" -exec rm {} \;
-	@find -iname "*.form" -exec rm {} \;
-	@find -iname "*.o" -exec rm {} \;
-	@find -iname ".*.o" -exec rm {} \;
-	@find -iname "*~" -exec rm {} \;
-	@find -iname "*.log" -exec rm {} \;
-	@find -iname "*.swp" -exec rm {} \;
-	@find -iname "*.tmp" -exec rm {} \;
-	@find -iname "*.svn-base" -exec rm -r {} \;
-	@find -iname "*.svn" -exec rm -r {} \;
-	@find -iname "Makefile" -exec rm {} \;
-
-svn:
-	@find -iname "*.log" -exec rm {} \;
-	@find -iname "*.swp" -exec rm {} \;
-	@find -iname "*.tmp" -exec rm {} \;
-	@find -iname "*.svn-base" -exec rm -r {} \;
-	@find -iname "*.svn" -exec rm -r {} ;\
+	doxygen doc_config
\ No newline at end of file
--
libgit2 0.21.2