Download as
Browse Code »

Commit 4ee488933cd56358cc013c8d5bc2b670f219dc0f

Authored by Perry Werneck
1 parent 361679f8
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Reorganizando makefiles, separando melhor os módulos

Showing 9 changed files with 272 additions and 51 deletions   Show diff stats
.gitignore
  Diff comments   View file @4ee4889
... ... @@ -16,6 +16,7 @@
16 16 *.cache
17 17 *.png
18 18 *.zip
  19 +*.ico
19 20 *.[0-9]
20 21 versions
21 22 ChangeLog*
... ... @@ -28,24 +29,8 @@ pw3270.po
28 29 pw3270.spec
29 30 revision
30 31 revision.m4
31   -src/classlib/class.mak
32   -src/include/lib3270/config.h
33 32 stamp-h1
34   -src/include/plugin.mak
35   -src/include/rules.mak
36   -src/java/jni3270.h
37   -src/lib3270/fallbacks.c
38   -src/lib3270/mkversion.sh
39   -src/lib3270/version.c
40   -src/loffice/description.xml
41   -src/loffice/manifest.xml
42   -src/php/php3270.h
43   -src/pw3270/pw3270-logo.png
44   -src/pw3270/pw3270.png
45   -src/pw3270/v3270/marshal.c
46   -src/pw3270/v3270/marshal.h
47   -src/plugins/dbus3270/dbus-glue.h
48   -src/java/javadoc/
49   -src/loffice/.rdb/
50   -src/loffice/include/
  33 +marshal.c
  34 +marshal.h
  35 +
51 36  
... ...
configure.ac
  Diff comments   View file @4ee4889
... ... @@ -56,6 +56,7 @@ AC_PROG_CXX
56 56 AC_PROG_CC
57 57 AC_PROG_SED
58 58 AC_PROG_LN_S
  59 +AC_PATH_TOOL([AR], [ar], [ar])
59 60  
60 61 AC_LANG([C])
61 62  
... ... @@ -316,7 +317,10 @@ dnl Configure which files to generate.
316 317 dnl ---------------------------------------------------------------------------
317 318  
318 319 AC_CONFIG_FILES(src/lib3270/Makefile)
  320 +
319 321 AC_CONFIG_FILES(src/pw3270/Makefile)
  322 +AC_CONFIG_FILES(src/pw3270/v3270/Makefile)
  323 +
320 324 dnl AC_CONFIG_FILES(Makefile)
321 325  
322 326 dnl ---------------------------------------------------------------------------
... ...
src/lib3270/Makefile.in
  Diff comments   View file @4ee4889
... ... @@ -155,6 +155,8 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
155 155 @$(MKDIR) `dirname $@`
156 156 @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -o $@ $^ $(LIBS)
157 157  
  158 +#---[ Clean Targets]---------------------------------------------------------------------
  159 +
158 160 cleanDebug:
159 161  
160 162 @rm -fr $(OBJDBG) \
... ...
src/pw3270/Makefile.in
  Diff comments   View file @4ee4889
... ... @@ -83,6 +83,13 @@ $(OBJDBG)/%.o: \
83 83 -DBUILD_DATE=`date +"0x%Y%m%d"`\
84 84 -o $@ -c $<
85 85  
  86 +$(BASEDIR)/.obj/Debug/%.a: \
  87 + ./%/* \
  88 + $(DEPENDS)
  89 +
  90 + @$(MAKE) -C $(basename $(notdir $@)) $@
  91 +
  92 +
86 93 $(OBJRLS)/%.o: \
87 94 %.c \
88 95 $(DEPENDS)
... ... @@ -118,10 +125,35 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \
118 125 @$(LN_S) -f $(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ $@
119 126  
120 127 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
121   - $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o)
  128 + $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o) \
  129 + $(BASEDIR)/.obj/Debug/v3270.a
122 130  
123 131 @echo $(basename $@) ...
124 132 @$(MKDIR) `dirname $@`
125 133 @$(LD) -shared -Wl,-soname,$(LIBNAME) $(LDFLAGS) -L$(BINDBG) -o $@ $^ $(LIBS)
126 134  
127 135  
  136 +#---[ Clean Targets]---------------------------------------------------------------------
  137 +
  138 +cleanDebug:
  139 +
  140 + @rm -fr $(OBJDBG) \
  141 + $(BINDBG)/$(LIBNAME) \
  142 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
  143 + $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  144 +
  145 + @make -C v3270 cleanDebug
  146 +
  147 +cleanRelease:
  148 +
  149 + @rm -fr $(OBJRLS) \
  150 + $(BINRLS)/$(LIBNAME) \
  151 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
  152 + $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
  153 +
  154 + @make -C v3270 cleanRelease
  155 +
  156 +clean: \
  157 + cleanDebug \
  158 + cleanRelease
  159 +
... ...
src/pw3270/dialog.c
  Diff comments   View file @4ee4889
... ... @@ -509,7 +509,12 @@
509 509 g_free(filename);
510 510 g_free(text);
511 511  
  512 +#ifdef PACKAGE_REVISION
512 513 text = g_strdup_printf(_("Version %s - Revision %s"),PACKAGE_VERSION,PACKAGE_REVISION);
  514 +#else
  515 + text = g_strdup_printf(_("Version %s - Revision %08lx"),PACKAGE_VERSION,BUILD_DATE);
  516 +#endif // PACKAGE_REVISION
  517 +
513 518 gtk_about_dialog_set_version(dialog,text);
514 519 g_free(text);
515 520  
... ...
src/pw3270/pw3270-GTK.cbp
  Diff comments   View file @4ee4889
... ... @@ -3,6 +3,7 @@
3 3 <FileVersion major="1" minor="6" />
4 4 <Project>
5 5 <Option title="pw3270-GTK" />
  6 + <Option makefile_is_custom="1" />
6 7 <Option pch_mode="2" />
7 8 <Option compiler="gcc" />
8 9 <Build>
... ...
src/pw3270/v3270/Makefile.in 0 → 100644
  Diff comments   View file @4ee4889
... ... @@ -0,0 +1,138 @@
  1 +#
  2 +# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 +# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 +# aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 +#
  6 +# Copyright (C) <2008> <Banco do Brasil S.A.>
  7 +#
  8 +# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 +# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 +# Free Software Foundation.
  11 +#
  12 +# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 +# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 +# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 +# obter mais detalhes.
  16 +#
  17 +# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 +# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
  19 +# Place, Suite 330, Boston, MA, 02111-1307, USA
  20 +#
  21 +# Contatos:
  22 +#
  23 +# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  24 +# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
  25 +#
  26 +
  27 +MODULE_NAME=v3270
  28 +
  29 +SOURCES=marshal.c widget.c oia.c iocallback.c keyboard.c draw.c mouse.c selection.c \
  30 + accessible.c security.c macros.c hostselect.c properties.c
  31 +
  32 +#---[ Configuration values ]-------------------------------------------------------------
  33 +
  34 +PACKAGE_NAME=@PACKAGE_NAME@
  35 +PACKAGE_VERSION=@PACKAGE_VERSION@
  36 +PACKAGE_TARNAME=@PACKAGE_TARNAME@
  37 +
  38 +prefix=@prefix@
  39 +exec_prefix=@exec_prefix@
  40 +bindir=@bindir@
  41 +sbindir=@sbindir@
  42 +libdir=@libdir@
  43 +
  44 +BASEDIR=@BASEDIR@
  45 +
  46 +OBJDIR=.obj
  47 +OBJDBG=$(OBJDIR)/Debug
  48 +OBJRLS=$(OBJDIR)/Release
  49 +
  50 +MKDIR=@MKDIR_P@
  51 +CC=@CC@
  52 +LD=@CC@
  53 +AR=@AR@
  54 +
  55 +CFLAGS=@CFLAGS@ @LIB3270_CFLAGS@ -Wno-deprecated-declarations @GTK_CFLAGS@ -I$(BASEDIR)/src/include/pw3270
  56 +LIBS=@LIBS@ @GTK_LIBS@ @LIB3270_LIBS@
  57 +
  58 +#---[ Rules ]----------------------------------------------------------------------------
  59 +
  60 +DEPENDS=$(BASEDIR)/src/include/*.h $(BASEDIR)/src/include/lib3270/*.h $(BASEDIR)/src/include/pw3270/*.h *.h Makefile
  61 +
  62 +$(OBJDBG)/%.o: \
  63 + %.c \
  64 + $(DEPENDS)
  65 +
  66 + @echo $< ...
  67 + @$(MKDIR) `dirname $@`
  68 + @$(CC) $(CFLAGS) \
  69 + @DBG_CFLAGS@ \
  70 + -DBUILD_DATE=`date +"0x%Y%m%d"`\
  71 + -o $@ -c $<
  72 +
  73 +$(OBJRLS)/%.o: \
  74 + %.c \
  75 + $(DEPENDS)
  76 +
  77 + @echo $< ...
  78 + @$(MKDIR) `dirname $@`
  79 + @$(CC) $(CFLAGS) \
  80 + @RLS_CFLAGS@ \
  81 + -DBUILD_DATE=`date +"0x%Y%m%d"` \
  82 + -o $@ -c $<
  83 +
  84 +marshal.h: \
  85 + genmarshal
  86 +
  87 + @echo $< ...
  88 + @$(MKDIR) `dirname $@`
  89 + @glib-genmarshal --prefix=v3270 --header genmarshal > $@
  90 +
  91 +marshal.c: \
  92 + marshal.h
  93 +
  94 + @echo $< ...
  95 + @$(MKDIR) `dirname $@`
  96 + @glib-genmarshal --prefix=v3270 --body genmarshal > $@
  97 +
  98 +#---[ Release Targets ]------------------------------------------------------------------
  99 +
  100 +Release: \
  101 + $(BASEDIR)/.obj/Release/$(MODULE_NAME).a
  102 +
  103 +$(BASEDIR)/.obj/Release/$(MODULE_NAME).a: \
  104 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o)
  105 +
  106 + @echo $@ ...
  107 + @$(MKDIR) `dirname $@`
  108 + @$(AR) rcs $@ $^
  109 +
  110 +#---[ Debug Targets ]--------------------------------------------------------------------
  111 +
  112 +Debug: \
  113 + $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a
  114 +
  115 +$(BASEDIR)/.obj/Debug/$(MODULE_NAME).a: \
  116 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o)
  117 +
  118 + @echo $@ ...
  119 + @$(MKDIR) `dirname $@`
  120 + @$(AR) rcs $@ $^
  121 +
  122 +#---[ Clean Targets]---------------------------------------------------------------------
  123 +
  124 +cleanDebug:
  125 +
  126 + @rm -fr $(BASEDIR)/.obj/Debug/$(MODULE_NAME).a \
  127 + $(OBJDBG)
  128 +
  129 +cleanRelease:
  130 +
  131 + @rm -fr $(BASEDIR)/.obj/Release/$(MODULE_NAME).a \
  132 + $(OBJRLS)
  133 +
  134 +clean: \
  135 + cleanDebug \
  136 + cleanRelease
  137 +
  138 +
... ...
src/pw3270/v3270/sources.mak
View file @361679f
... ... @@ -1,31 +0,0 @@
1   -#
2   -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
3   -# (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4   -# aplicativos mainframe. Registro no INPI sob o nome G3270.
5   -#
6   -# Copyright (C) <2008> <Banco do Brasil S.A.>
7   -#
8   -# Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
9   -# os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
10   -# Free Software Foundation.
11   -#
12   -# Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
13   -# GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
14   -# A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
15   -# obter mais detalhes.
16   -#
17   -# Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
18   -# programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple
19   -# Place, Suite 330, Boston, MA, 02111-1307, USA
20   -#
21   -# Contatos:
22   -#
23   -# perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
24   -# erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
25   -# licinio@bb.com.br (Licínio Luis Branco)
26   -# kraucer@bb.com.br (Kraucer Fernandes Mazuco)
27   -#
28   -
29   -V3270_SRC=marshal.c widget.c oia.c iocallback.c keyboard.c draw.c mouse.c selection.c \
30   - accessible.c security.c macros.c hostselect.c properties.c
31   -
src/pw3270/v3270/v3270.cbp 0 → 100644
  Diff comments   View file @4ee4889
... ... @@ -0,0 +1,85 @@
  1 +<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
  2 +<CodeBlocks_project_file>
  3 + <FileVersion major="1" minor="6" />
  4 + <Project>
  5 + <Option title="3270 terminal widget for gtk" />
  6 + <Option makefile_is_custom="1" />
  7 + <Option pch_mode="2" />
  8 + <Option compiler="gcc" />
  9 + <Build>
  10 + <Target title="Debug">
  11 + <Option output=".bin/Debug/3270 terminal widget for gtk" prefix_auto="1" extension_auto="1" />
  12 + <Option object_output=".obj/Debug/" />
  13 + <Option type="1" />
  14 + <Option compiler="gcc" />
  15 + <Compiler>
  16 + <Add option="-g" />
  17 + </Compiler>
  18 + </Target>
  19 + <Target title="Release">
  20 + <Option output=".bin/Release/3270 terminal widget for gtk" prefix_auto="1" extension_auto="1" />
  21 + <Option object_output=".obj/Release/" />
  22 + <Option type="1" />
  23 + <Option compiler="gcc" />
  24 + <Compiler>
  25 + <Add option="-O2" />
  26 + </Compiler>
  27 + <Linker>
  28 + <Add option="-s" />
  29 + </Linker>
  30 + </Target>
  31 + </Build>
  32 + <Compiler>
  33 + <Add option="-Wall" />
  34 + </Compiler>
  35 + <Unit filename="accessible.c">
  36 + <Option compilerVar="CC" />
  37 + </Unit>
  38 + <Unit filename="accessible.h" />
  39 + <Unit filename="draw.c">
  40 + <Option compilerVar="CC" />
  41 + </Unit>
  42 + <Unit filename="hostselect.c">
  43 + <Option compilerVar="CC" />
  44 + </Unit>
  45 + <Unit filename="hostselect.h" />
  46 + <Unit filename="iocallback.c">
  47 + <Option compilerVar="CC" />
  48 + </Unit>
  49 + <Unit filename="keyboard.c">
  50 + <Option compilerVar="CC" />
  51 + </Unit>
  52 + <Unit filename="macros.c">
  53 + <Option compilerVar="CC" />
  54 + </Unit>
  55 + <Unit filename="marshal.c">
  56 + <Option compilerVar="CC" />
  57 + </Unit>
  58 + <Unit filename="marshal.h" />
  59 + <Unit filename="mouse.c">
  60 + <Option compilerVar="CC" />
  61 + </Unit>
  62 + <Unit filename="oia.c">
  63 + <Option compilerVar="CC" />
  64 + </Unit>
  65 + <Unit filename="private.h" />
  66 + <Unit filename="properties.c">
  67 + <Option compilerVar="CC" />
  68 + </Unit>
  69 + <Unit filename="security.c">
  70 + <Option compilerVar="CC" />
  71 + </Unit>
  72 + <Unit filename="selection.c">
  73 + <Option compilerVar="CC" />
  74 + </Unit>
  75 + <Unit filename="widget.c">
  76 + <Option compilerVar="CC" />
  77 + </Unit>
  78 + <Extensions>
  79 + <code_completion />
  80 + <envvars />
  81 + <debugger />
  82 + <lib_finder disable_auto="1" />
  83 + </Extensions>
  84 + </Project>
  85 +</CodeBlocks_project_file>
... ...