diff --git a/configure.ac b/configure.ac index b32c461..142b191 100644 --- a/configure.ac +++ b/configure.ac @@ -194,7 +194,6 @@ AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_ AC_ARG_WITH([session-name], [AS_HELP_STRING([--with-session-name], [Set default session name])], [ AC_DEFINE_UNQUOTED(DEFAULT_SESSION_NAME, $withval) ],[ AC_MSG_NOTICE([No default session name.]) ]) AC_ARG_WITH([application-name], [AS_HELP_STRING([--with-application-name], [Set application name])], [ AC_DEFINE_UNQUOTED(APPLICATION_NAME, $withval) ],[ AC_MSG_NOTICE([No default application name.]) ]) - app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1) app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2) @@ -211,6 +210,20 @@ AC_ARG_WITH([source-locales], [AS_HELP_STRING([--with-source-locales], [Set path AC_DEFINE_UNQUOTED(LIBRARY_POT_FILES, $app_cv_source_locales) AC_SUBST(LIBRARY_POT_FILES,$app_cv_source_locales) +case "$host" in + *-mingw32|*-pc-msys) + AC_SUBST(LIBEXT,.dll) + ;; + + s390x-*) + AC_SUBST(LIBEXT,.so) + ;; + + *) + AC_SUBST(LIBEXT,.so.$app_vrs_major.$app_vrs_minor) + +esac + dnl --------------------------------------------------------------------------- dnl Check for libintl dnl --------------------------------------------------------------------------- diff --git a/locale/pt_BR.po b/locale/pt_BR.po index e8fe4d2..2f18f6f 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-06 14:43-0300\n" +"POT-Creation-Date: 2019-08-07 16:02-0300\n" "PO-Revision-Date: 2019-08-06 14:45-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português <>\n" @@ -558,8 +558,8 @@ msgstr "Não é possível salvar" msgid "Can't save \"%s\": %s" msgstr "Não foi possível salvar %s: %s" -#: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:438 -#: src/trace/trace.c:451 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454 +#: src/filetransfer/save.c:117 src/filetransfer/activitylist.c:438 +#: src/trace/trace.c:473 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454 #, c-format msgid "Can't save %s" msgstr "Não foi possível salvar arquivo %s" @@ -1972,7 +1972,7 @@ msgstr "" "%s" #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:455 -#: src/trace/trace.c:470 src/dialogs/transfer.c:73 +#: src/trace/trace.c:492 src/dialogs/transfer.c:73 msgid "Save" msgstr "Salvar" @@ -2004,7 +2004,7 @@ msgstr "Salvar área selecionada" msgid "Save terminal contents" msgstr "Salvar conteúdo da tela" -#: src/trace/trace.c:469 +#: src/trace/trace.c:491 msgid "Save trace to file" msgstr "Salvar trace para arquivo" @@ -2349,7 +2349,7 @@ msgstr "Nome da sessão TN3270" msgid "Terminal colors" msgstr "Cores do terminal" -#: src/trace/trace.c:473 +#: src/trace/trace.c:495 msgid "Text file" msgstr "Arquivo texto" diff --git a/locale/pw3270.pot b/locale/pw3270.pot index d3b5090..9723645 100644 --- a/locale/pw3270.pot +++ b/locale/pw3270.pot @@ -9,7 +9,7 @@ msgstr "" "#-#-#-#-# pw3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-06 14:43-0300\n" +"POT-Creation-Date: 2019-08-07 16:05-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,7 +20,7 @@ msgstr "" "#-#-#-#-# lib3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-06 16:48+0000\n" +"POT-Creation-Date: 2019-08-07 13:02+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "" "#-#-#-#-# libv3270.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-06 16:50+0000\n" +"POT-Creation-Date: 2019-08-07 13:40+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -576,8 +576,8 @@ msgstr "" msgid "Can't save \"%s\": %s" msgstr "" -#: src/filetransfer/save.c:116 src/filetransfer/activitylist.c:438 -#: src/trace/trace.c:451 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454 +#: src/filetransfer/save.c:117 src/filetransfer/activitylist.c:438 +#: src/trace/trace.c:473 src/dialogs/transfer.c:97 src/dialogs/save/save.c:454 #, c-format msgid "Can't save %s" msgstr "" @@ -1947,7 +1947,7 @@ msgid "" msgstr "" #: src/filetransfer/v3270ft.c:217 src/filetransfer/activitylist.c:455 -#: src/trace/trace.c:470 src/dialogs/transfer.c:73 +#: src/trace/trace.c:492 src/dialogs/transfer.c:73 msgid "Save" msgstr "" @@ -1979,7 +1979,7 @@ msgstr "" msgid "Save terminal contents" msgstr "" -#: src/trace/trace.c:469 +#: src/trace/trace.c:491 msgid "Save trace to file" msgstr "" @@ -2312,7 +2312,7 @@ msgstr "" msgid "Terminal colors" msgstr "" -#: src/trace/trace.c:473 +#: src/trace/trace.c:495 msgid "Text file" msgstr "" diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index f5746a1..2fb5f3b 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -24,7 +24,7 @@ # erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) # -LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@ +LIBNAME=@DLLPREFIX@@PACKAGE_TARNAME@@LIBEXT@ LIB_SOURCES=\ window.c \ @@ -229,8 +229,8 @@ $(BASEDIR)/.pot/pw3270.pot: \ @$(MSGCAT) --sort-output $^ > $@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ - $(BINRLS)/$(LIBNAME) \ - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC).o) \ + $(BINRLS)/$(LIBNAME) @$(LD) \ $(LDFLAGS) \ @@ -238,26 +238,9 @@ $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@: \ -o $@ \ $^ \ -L$(BINRLS) \ - $(LIBS) \ - -l@PACKAGE_TARNAME@ + $(LIBS) $(BINRLS)/$(LIBNAME): \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ - - @echo $(basename $@) ... - @$(MKDIR) `dirname $@` - @rm -f $@ - @$(LN_S) $^ $@ - -$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ - - @echo $(basename $@) ... - @$(MKDIR) `dirname $@` - @rm -f $@ - @$(LN_S) $^ $@ - -$(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJRLS)/$(SRC).o) \ $(foreach MOD, $(MODULES), $(BASEDIR)/.obj/Release/$(MOD).a) @@ -276,8 +259,17 @@ install: \ @$(MKDIR) $(DESTDIR)$(libdir) @$(INSTALL_PROGRAM) \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ - $(DESTDIR)$(libdir) + $(BINRLS)/$(LIBNAME) \ + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + + + @$(LN_S) \ + @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ \ + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@ + + @$(LN_S) \ + @DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@.@PACKAGE_MAJOR_VERSION@ \ + $(DESTDIR)$(libdir)/@DLLPREFIX@@PACKAGE_TARNAME@@DLLEXT@ @$(MKDIR) $(DESTDIR)$(bindir) @@ -299,8 +291,8 @@ Debug: \ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ - $(BINDBG)/$(LIBNAME) \ - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC).o) \ + $(BINDBG)/$(LIBNAME) @$(LD) \ $(LDFLAGS) \ @@ -308,26 +300,9 @@ $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@: \ -o $@ \ $^ \ -L$(BINDBG) \ - $(LIBS) \ - -l@PACKAGE_TARNAME@ + $(LIBS) $(BINDBG)/$(LIBNAME): \ - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ - - @echo $(basename $@) ... - @$(MKDIR) `dirname $@` - @rm -f $@ - @$(LN_S) $^ $@ - -$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@: \ - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ - - @echo $(basename $@) ... - @$(MKDIR) `dirname $@` - @rm -f $@ - @$(LN_S) $^ $@ - -$(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ $(foreach SRC, $(basename $(LIB_SOURCES)), $(OBJDBG)/$(SRC).o) \ $(foreach MOD, $(MODULES), $(BASEDIR)/.obj/Debug/$(MOD).a) @@ -347,9 +322,8 @@ $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ cleanDebug: @rm -fr $(OBJDBG) \ - $(BINDBG)/$(LIBNAME) \ - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ - $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ + $(BINDBG)/$(LIBNAME) @make -C uiparser cleanDebug @make -C common cleanDebug @@ -357,9 +331,8 @@ cleanDebug: cleanRelease: @rm -fr $(OBJRLS) \ - $(BINRLS)/$(LIBNAME) \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ - $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ + $(BINRLS)/$(PACKAGE_TARNAME)@EXEEXT@ \ + $(BINRLS)/$(LIBNAME) @make -C uiparser cleanRelease @make -C common cleanRelease -- libgit2 0.21.2