Download as
Browse Code »

Commit b3b06a9c67e030c0b01c0230ad7be5b92b334074

Authored by perry.werneck@gmail.com
1 parent 26b1ca43
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Corrigindo construção das bibliotecas de apoio para plugins, endereço da FSF est… 

…ava errado no arquivo colors.conf
Showing 3 changed files with 20 additions and 11 deletions   Show diff stats
1 # 1 #
2 -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 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 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. 4 # aplicativos mainframe. Registro no INPI sob o nome G3270.
5 # 5 #
6 -# Copyright (C) <2008> <Banco do Brasil S.A.> 6 +# Copyright (C) <2008> <Banco do Brasil S.A.>
7 # 7 #
8 # Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob 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 9 # os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
@@ -15,8 +15,9 @@ @@ -15,8 +15,9 @@
15 # obter mais detalhes. 15 # obter mais detalhes.
16 # 16 #
17 # Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este 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 18 +# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
  19 +# St, Fifth Floor, Boston, MA 02110-1301 USA
  20 +#
20 # 21 #
21 # Contatos: 22 # Contatos:
22 # 23 #
src/include/plugin.mak.in
  Diff comments   View file @b3b06a9
@@ -50,12 +50,12 @@ MSGCAT=@MSGCAT@ @@ -50,12 +50,12 @@ MSGCAT=@MSGCAT@
50 XGETTEXT=@XGETTEXT@ 50 XGETTEXT=@XGETTEXT@
51 51
52 #---[ Rules ]------------------------------------------------------------------ 52 #---[ Rules ]------------------------------------------------------------------
53 -LDSOFLAGS=@LDSOFLAGS@ 53 +VERSION=@VERSION@
54 DLL_FLAGS=@DLL_FLAGS@ 54 DLL_FLAGS=@DLL_FLAGS@
55 DLL_CFLAGS=@DLL_CFLAGS@ 55 DLL_CFLAGS=@DLL_CFLAGS@
56 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall 56 DEBUG_CFLAGS=-DDEBUG=1 -g -Wall
57 LIB3270_MODE ?= Default 57 LIB3270_MODE ?= Default
58 -DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@.@VERSION@ 58 +DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@
59 PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ 59 PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@
60 60
61 ifeq ($(LIB3270_MODE),Debug) 61 ifeq ($(LIB3270_MODE),Debug)
@@ -110,6 +110,14 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@ @@ -110,6 +110,14 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@
110 110
111 Debug: $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@ 111 Debug: $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@
112 112
  113 +$(BINDBG)$(DLL_NAME): $(BINDBG)$(DLL_NAME).$(VERSION)
  114 + @rm -f $@
  115 + @cd $(BINDBG)@DLLDIR@ && $(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@
  116 +
  117 +$(BINRLS)$(DLL_NAME): $(BINRLS)$(DLL_NAME).$(VERSION)
  118 + @rm -f $@
  119 + @cd $(BINRLS)@DLLDIR@ && $(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@
  120 +
113 clean: 121 clean:
114 @rm -fr $(OBJDIR) 122 @rm -fr $(OBJDIR)
115 @rm -fr $(BINDIR) 123 @rm -fr $(BINDIR)
src/plugins/rx3270/Makefile.in
  Diff comments   View file @b3b06a9
@@ -48,9 +48,9 @@ include ../../include/plugin.mak @@ -48,9 +48,9 @@ include ../../include/plugin.mak
48 $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) 48 $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME)
49 @echo " CCLD `basename $@`" 49 @echo " CCLD `basename $@`"
50 @$(MKDIR) `dirname $@` 50 @$(MKDIR) `dirname $@`
51 - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) 51 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS)
52 52
53 -$(BINDBG)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) 53 +$(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@)
54 @echo " CCLD `basename $@`" 54 @echo " CCLD `basename $@`"
55 @$(MKDIR) `dirname $@` 55 @$(MKDIR) `dirname $@`
56 @$(CXX) $(DLL_FLAGS) $(LDFLAGS) @DBGRPATH@ @LDSOFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) 56 @$(CXX) $(DLL_FLAGS) $(LDFLAGS) @DBGRPATH@ @LDSOFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS)
@@ -60,10 +60,10 @@ $(BINDBG)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC) @@ -60,10 +60,10 @@ $(BINDBG)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)
60 $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) 60 $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME)
61 @echo " CCLD `basename $@`" 61 @echo " CCLD `basename $@`"
62 @$(MKDIR) `dirname $@` 62 @$(MKDIR) `dirname $@`
63 - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) 63 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS)
64 64
65 -$(BINRLS)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) 65 +$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o)
66 @echo " CCLD `basename $@`" 66 @echo " CCLD `basename $@`"
67 @$(MKDIR) `dirname $@` 67 @$(MKDIR) `dirname $@`
68 - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) 68 + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS)
69 69