From 9ea7f21c15eaeb42c26d778690d6fde0831cc937 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 21 Jun 2016 14:41:08 -0300
Subject: [PATCH] Ajustes no empacotamento.

---
 po/pt_BR.po               | 12 ++++++------
 src/classlib/class.mak.in |  8 ++++++--
 src/java/Makefile.in      | 34 ++++++++++++++++++++++++++--------
 3 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/po/pt_BR.po b/po/pt_BR.po
index 998f2cb..4cb8e68 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pw3270 5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-31 10:44-0300\n"
+"POT-Creation-Date: 2016-06-07 08:45-0300\n"
 "PO-Revision-Date: 2016-05-31 11:16-0300\n"
 "Last-Translator: Perry Werneck <perry.werneck@gmail.com>\n"
 "Language-Team: Português <perry.werneck@gmail.com>\n"
@@ -103,7 +103,7 @@ msgstr "- Emulador 3270 para GTK"
 msgid "16 colors"
 msgstr "16 cores"
 
-#: screen.c:691 screen.c:721 screen.c:735 screen.c:860
+#: screen.c:688 screen.c:718 screen.c:732 screen.c:862
 msgid "3270 Error"
 msgstr "Erro 3270"
 
@@ -111,7 +111,7 @@ msgstr "Erro 3270"
 msgid "3270 File transfer"
 msgstr "Transferência de arquivos 3270"
 
-#: screen.c:706
+#: screen.c:703
 msgid "3270 Warning"
 msgstr "Alerta 3270"
 
@@ -806,7 +806,7 @@ msgstr "Apagar até o final do campo"
 msgid "Erase to end of line"
 msgstr "Apagar até o final da linha"
 
-#: print.c:247 v3270/widget.c:194 util.c:981
+#: print.c:247 v3270/widget.c:194 util.c:982
 msgid "Error"
 msgstr "Erro"
 
@@ -2486,7 +2486,7 @@ msgstr "Janela"
 msgid "Windows Western languages (CP1252)"
 msgstr "Windows ocidental (CP1252)"
 
-#: util.c:159
+#: util.c:160
 #, c-format
 msgid "Windows error %d"
 msgstr "Erro windows %d"
@@ -2711,7 +2711,7 @@ msgstr "Atributo inesperado \"action\" em <%s>"
 msgid "an action attribute"
 msgstr "um atributo \"action\""
 
-#: session.c:267
+#: session.c:268
 msgid "bracket"
 msgstr "bracket"
 
diff --git a/src/classlib/class.mak.in b/src/classlib/class.mak.in
index 82cc9d3..70b1964 100644
--- a/src/classlib/class.mak.in
+++ b/src/classlib/class.mak.in
@@ -34,12 +34,16 @@ CLASS_RELEASE_OBJECTS=$(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/classli
 
 #---[ Rules ]------------------------------------------------------------------
 
-$(OBJDBG)/classlib/%.o: $(CLASSLIBDIR)/%.cc
+$(OBJDBG)/classlib/%.o: \
+	$(CLASSLIBDIR)/%.cc
+
 	@echo "  CC   `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $<
 
-$(OBJRLS)/classlib/%.o: $(CLASSLIBDIR)/%.cc
+$(OBJRLS)/classlib/%.o: \
+	$(CLASSLIBDIR)/%.cc
+
 	@echo "  CC   `basename $@`"
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $<
diff --git a/src/java/Makefile.in b/src/java/Makefile.in
index aab7507..3b19ebb 100644
--- a/src/java/Makefile.in
+++ b/src/java/Makefile.in
@@ -111,32 +111,48 @@ $(OBJRLS)/j3270/%.o: %.cc Makefile private.h
 	@mkdir -p `dirname $@`
 	@$(CXX) -DNDEBUG=1 $(PLUGIN_CFLAGS) -o $@ -c $<
 
-$(BINDIR)/java/%.class: %.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+$(BINDIR)/java/%.class: \
+	%.java \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
 
-$(BINDIR)/java/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+$(BINDIR)/java/%.class: \
+	sample/%.java \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
 
-$(BINDIR)/%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+$(BINDIR)/%.class: \
+	sample/%.java \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d $(BINDIR)/java $<
 
-%.class: sample/%.java $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+%.class: \
+	sample/%.java \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	@$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -d `dirname $@` $<
 
-$(BINDIR)/java/$(PACKAGE_NAME)/%.class: %.java
+$(BINDIR)/java/pw3270/%.class: \
+	%.java
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
 	@$(JAVAC) -encoding utf-8 -d $(BINDIR)/java $^
 
-$(BINRLS)/$(PACKAGE_NAME).jar: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+$(BINRLS)/$(PACKAGE_NAME).jar: \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $@ ...
 	@mkdir -p `dirname $@`
 	@$(JAR) -cvf "$@" -C "$(BINDIR)/java" "$(PACKAGE_NAME)"
@@ -307,10 +323,12 @@ install: \
 	install-plugin \
 	install-doc
 
-jni3270.h: $(BINDIR)/java/$(PACKAGE_NAME)/terminal.class
+jni3270.h: \
+	$(BINDIR)/java/pw3270/terminal.class
+
 	@echo $< ...
 	@mkdir -p `dirname $@`
-	@$(JAVAH) -o $@ -classpath $(BINDIR)/java $(PACKAGE_NAME).terminal
+	@$(JAVAH) -o $@ -classpath $(BINDIR)/java pw3270.terminal
 
 cleanDebug: clean
 
--
libgit2 0.21.2