diff --git a/colors.conf b/colors.conf index 542dc0a..e4ea70b 100644 --- a/colors.conf +++ b/colors.conf @@ -1,9 +1,9 @@ # -# "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270 +# 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> +# Copyright (C) <2008> # # 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 @@ -15,8 +15,9 @@ # 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 +# programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin +# St, Fifth Floor, Boston, MA 02110-1301 USA +# # # Contatos: # diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in index fba1478..fff786f 100644 --- a/src/include/plugin.mak.in +++ b/src/include/plugin.mak.in @@ -50,12 +50,12 @@ MSGCAT=@MSGCAT@ XGETTEXT=@XGETTEXT@ #---[ Rules ]------------------------------------------------------------------ -LDSOFLAGS=@LDSOFLAGS@ +VERSION=@VERSION@ DLL_FLAGS=@DLL_FLAGS@ DLL_CFLAGS=@DLL_CFLAGS@ DEBUG_CFLAGS=-DDEBUG=1 -g -Wall LIB3270_MODE ?= Default -DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@.@VERSION@ +DLL_NAME=@DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ PLUGIN_NAME=plugins/$(MODULE_NAME)@DLLEXT@ ifeq ($(LIB3270_MODE),Debug) @@ -110,6 +110,14 @@ Release: $(BINRLS)/plugins/$(MODULE_NAME)@DLLEXT@ Debug: $(BINDBG)/plugins/$(MODULE_NAME)@DLLEXT@ +$(BINDBG)$(DLL_NAME): $(BINDBG)$(DLL_NAME).$(VERSION) + @rm -f $@ + @cd $(BINDBG)@DLLDIR@ && $(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@ + +$(BINRLS)$(DLL_NAME): $(BINRLS)$(DLL_NAME).$(VERSION) + @rm -f $@ + @cd $(BINRLS)@DLLDIR@ && $(LN_S) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@.$(VERSION) @DLLPREFIX@$(MODULE_NAME)@DLLEXT@ + clean: @rm -fr $(OBJDIR) @rm -fr $(BINDIR) diff --git a/src/plugins/rx3270/Makefile.in b/src/plugins/rx3270/Makefile.in index 03e01f6..5308d6d 100644 --- a/src/plugins/rx3270/Makefile.in +++ b/src/plugins/rx3270/Makefile.in @@ -48,9 +48,9 @@ include ../../include/plugin.mak $(BINDBG)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJDBG)/$(SRC).o) $(BINDBG)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) -$(BINDBG)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) +$(BINDBG)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC)@OBJEXT@) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(CXX) $(DLL_FLAGS) $(LDFLAGS) @DBGRPATH@ @LDSOFLAGS@ -o $@ $^ $(LIBS) $(LIB3270_LIBS) @@ -60,10 +60,10 @@ $(BINDBG)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJDBG)/$(SRC) $(BINRLS)/$(PLUGIN_NAME): $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/$(SRC).o) $(BINRLS)$(DLL_NAME) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(PW3270_LIBS) $(GTK_LIBS) -$(BINRLS)$(DLL_NAME): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) +$(BINRLS)$(DLL_NAME).$(VERSION): $(foreach SRC, $(basename $(EXTAPI_SRC)), $(OBJRLS)/$(SRC).o) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_FLAGS) $(LDSOFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) + @$(CXX) $(DLL_FLAGS) @LDSOFLAGS@ $(LDFLAGS) -o $@ $^ $(LIBS) $(LIB3270_LIBS) -- libgit2 0.21.2