From 4ee488933cd56358cc013c8d5bc2b670f219dc0f Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Tue, 17 Jan 2017 17:50:44 -0200
Subject: [PATCH] Reorganizando makefiles, separando melhor os módulos

---
 .gitignore                   |  23 ++++-------------------
 configure.ac                 |   4 ++++
 src/lib3270/Makefile.in      |   2 ++
 src/pw3270/Makefile.in       |  34 +++++++++++++++++++++++++++++++++-
 src/pw3270/dialog.c          |   5 +++++
 src/pw3270/pw3270-GTK.cbp    |   1 +
 src/pw3270/v3270/Makefile.in | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/pw3270/v3270/sources.mak |  31 -------------------------------
 src/pw3270/v3270/v3270.cbp   |  85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 9 files changed, 272 insertions(+), 51 deletions(-)
 create mode 100644 src/pw3270/v3270/Makefile.in
 delete mode 100644 src/pw3270/v3270/sources.mak
 create mode 100644 src/pw3270/v3270/v3270.cbp

diff --git a/.gitignore b/.gitignore
index 479c75f..2496f9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@
 *.cache
 *.png
 *.zip
+*.ico
 *.[0-9]
 versions
 ChangeLog*
@@ -28,24 +29,8 @@ pw3270.po
 pw3270.spec
 revision
 revision.m4
-src/classlib/class.mak
-src/include/lib3270/config.h
 stamp-h1
-src/include/plugin.mak
-src/include/rules.mak
-src/java/jni3270.h
-src/lib3270/fallbacks.c
-src/lib3270/mkversion.sh
-src/lib3270/version.c
-src/loffice/description.xml
-src/loffice/manifest.xml
-src/php/php3270.h
-src/pw3270/pw3270-logo.png
-src/pw3270/pw3270.png
-src/pw3270/v3270/marshal.c
-src/pw3270/v3270/marshal.h
-src/plugins/dbus3270/dbus-glue.h
-src/java/javadoc/
-src/loffice/.rdb/
-src/loffice/include/
+marshal.c
+marshal.h
+
 
diff --git a/configure.ac b/configure.ac
index e6b5e2b..3a2288b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_SED
 AC_PROG_LN_S
+AC_PATH_TOOL([AR], [ar], [ar])
 
 AC_LANG([C])
 
@@ -316,7 +317,10 @@ dnl Configure which files to generate.
 dnl ---------------------------------------------------------------------------
 
 AC_CONFIG_FILES(src/lib3270/Makefile)
+
 AC_CONFIG_FILES(src/pw3270/Makefile)
+AC_CONFIG_FILES(src/pw3270/v3270/Makefile)
+
 dnl AC_CONFIG_FILES(Makefile)
 
 dnl ---------------------------------------------------------------------------
diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in
index 5d5874a..5511e44 100644
--- a/src/lib3270/Makefile.in
+++ b/src/lib3270/Makefile.in
@@ -155,6 +155,8 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
 	@$(MKDIR) `dirname $@`
 	@$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
 
+#---[ Clean Targets]---------------------------------------------------------------------
+
 cleanDebug:
 
 	@rm -fr	$(OBJDBG) \
diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in
index 45206db..0c6ce4c 100644
--- a/src/pw3270/Makefile.in
+++ b/src/pw3270/Makefile.in
@@ -83,6 +83,13 @@ $(OBJDBG)/%.o: \
 				-DBUILD_DATE=`date +"0x%Y%m%d"`\
 				-o $@ -c $<
 
+$(BASEDIR)/.obj/Debug/%.a: \
+	./%/* \
+	$(DEPENDS)
+ 
+	@$(MAKE) -C $(basename $(notdir $@)) $@
+
+
 $(OBJRLS)/%.o: \
 	%.c \
 	$(DEPENDS)
@@ -118,10 +125,35 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
 	@$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@
 
 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
-	$(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o)
+	$(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o) \
+	$(BASEDIR)/.obj/Debug/v3270.a
 
 	@echo $(basename $@) ...
 	@$(MKDIR) `dirname $@`
 	@$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -L$(BINDBG) -o $@ $^ $(LIBS)
 
 
+#---[ Clean Targets]---------------------------------------------------------------------
+
+cleanDebug:
+
+	@rm -fr	$(OBJDBG) \
+			$(BINDBG)/$(LIBNAME) \
+			$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
+			$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
+
+	@make -C v3270 cleanDebug
+
+cleanRelease:
+
+	@rm -fr	$(OBJRLS) \
+			$(BINRLS)/$(LIBNAME) \
+			$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
+			$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
+
+	@make -C v3270 cleanRelease
+
+clean: \
+	cleanDebug \
+	cleanRelease
+
diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c
index df1a171..59406be 100644
--- a/src/pw3270/dialog.c
+++ b/src/pw3270/dialog.c
@@ -509,7 +509,12 @@
 	g_free(filename);
 	g_free(text);
 
+#ifdef PACKAGE_REVISION
 	text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,PACKAGE_REVISION);
+#else
+	text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE);
+#endif // PACKAGE_REVISION
+
 	gtk_about_dialog_set_version(dialog,text);
 	g_free(text);
 
diff --git a/src/pw3270/pw3270-GTK.cbp b/src/pw3270/pw3270-GTK.cbp
index b7ccb36..d138a0a 100644
--- a/src/pw3270/pw3270-GTK.cbp
+++ b/src/pw3270/pw3270-GTK.cbp
@@ -3,6 +3,7 @@
 	<FileVersion major="1" minor="6" />
 	<Project>
 		<Option title="pw3270-GTK" />
+		<Option makefile_is_custom="1" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
diff --git a/src/pw3270/v3270/Makefile.in b/src/pw3270/v3270/Makefile.in
new file mode 100644
index 0000000..5e0d7ba
--- /dev/null
+++ b/src/pw3270/v3270/Makefile.in
@@ -0,0 +1,138 @@
+#
+# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+# aplicativos mainframe. Registro no INPI sob o nome G3270.
+#
+# Copyright (C) <2008> <Banco do Brasil S.A.>
+#
+# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+# os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+# Free Software Foundation.
+#
+# Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+# obter mais detalhes.
+#
+# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+# programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
+# Place, Suite 330, Boston, MA, 02111-1307, USA
+#
+# Contatos:
+#
+# perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+# erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
+#
+
+MODULE_NAME=v3270
+
+SOURCES=marshal.c widget.c oia.c iocallback.c keyboard.c draw.c mouse.c selection.c \
+		accessible.c security.c macros.c hostselect.c properties.c
+
+#---[ Configuration values ]-------------------------------------------------------------
+
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+sbindir=@sbindir@
+libdir=@libdir@
+
+BASEDIR=@BASEDIR@
+
+OBJDIR=.obj
+OBJDBG=$(OBJDIR)/Debug
+OBJRLS=$(OBJDIR)/Release
+
+MKDIR=@MKDIR_P@
+CC=@CC@
+LD=@CC@
+AR=@AR@
+
+CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
+LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
+
+#---[ Rules ]----------------------------------------------------------------------------
+
+DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile
+
+$(OBJDBG)/%.o: \
+	%.c \
+	$(DEPENDS)
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(CC) $(CFLAGS) \
+				@DBG_CFLAGS@ \
+				-DBUILD_DATE=`date +"0x%Y%m%d"`\
+				-o $@ -c $<
+
+$(OBJRLS)/%.o: \
+	%.c \
+	$(DEPENDS)
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@$(CC) $(CFLAGS) \
+				@RLS_CFLAGS@ \
+				-DBUILD_DATE=`date +"0x%Y%m%d"` \
+				-o $@ -c $<
+
+marshal.h: \
+	genmarshal
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@glib-genmarshal --prefix=v3270 --header genmarshal > $@
+
+marshal.c: \
+	marshal.h
+
+	@echo $< ...
+	@$(MKDIR) `dirname $@`
+	@glib-genmarshal --prefix=v3270 --body genmarshal > $@
+
+#---[ Release Targets ]------------------------------------------------------------------
+
+Release: \
+	$(BASEDIR)/.obj/Release/$(MODULE_NAME).a
+
+$(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
+	$(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
+
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(AR) rcs $@ $^
+
+#---[ Debug Targets ]--------------------------------------------------------------------
+
+Debug: \
+	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a
+
+$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \
+	$(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
+
+	@echo $@ ...
+	@$(MKDIR) `dirname $@`
+	@$(AR) rcs $@ $^
+
+#---[ Clean Targets]---------------------------------------------------------------------
+
+cleanDebug:
+
+	@rm -fr	$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \
+			$(OBJDBG)
+
+cleanRelease:
+
+	@rm -fr	$(BASEDIR)/.obj/Release/$(MODULE_NAME).a \
+			$(OBJRLS)
+
+clean: \
+	cleanDebug \
+	cleanRelease
+
+
diff --git a/src/pw3270/v3270/sources.mak b/src/pw3270/v3270/sources.mak
deleted file mode 100644
index 86e5a8a..0000000
--- a/src/pw3270/v3270/sources.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
-# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
-# aplicativos mainframe. Registro no INPI sob o nome G3270.
-#
-# Copyright (C) <2008> <Banco do Brasil S.A.>
-#
-# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
-# os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
-# Free Software Foundation.
-#
-# Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
-# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
-# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
-# obter mais detalhes.
-#
-# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
-# programa;  se  não, escreva para a Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA, 02111-1307, USA
-#
-# Contatos:
-#
-# perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
-# erico.mendonca@gmail.com	(Erico Mascarenhas de Mendonça)
-# licinio@bb.com.br			(Licínio Luis Branco)
-# kraucer@bb.com.br			(Kraucer Fernandes Mazuco)
-#
-
-V3270_SRC=marshal.c widget.c oia.c iocallback.c keyboard.c draw.c mouse.c selection.c \
-			accessible.c security.c macros.c hostselect.c properties.c
-
diff --git a/src/pw3270/v3270/v3270.cbp b/src/pw3270/v3270/v3270.cbp
new file mode 100644
index 0000000..ddd22c5
--- /dev/null
+++ b/src/pw3270/v3270/v3270.cbp
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="3270 terminal widget for gtk" />
+		<Option makefile_is_custom="1" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output=".bin/Debug/3270 terminal widget for gtk" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output=".bin/Release/3270 terminal widget for gtk" prefix_auto="1" extension_auto="1" />
+				<Option object_output=".obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+		</Compiler>
+		<Unit filename="accessible.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="accessible.h" />
+		<Unit filename="draw.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="hostselect.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="hostselect.h" />
+		<Unit filename="iocallback.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="keyboard.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="macros.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="marshal.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="marshal.h" />
+		<Unit filename="mouse.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="oia.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="private.h" />
+		<Unit filename="properties.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="security.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="selection.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="widget.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
--
libgit2 0.21.2