diff --git a/Makefile.in b/Makefile.in index a11e234..e5ed929 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,8 +49,8 @@ mandir=@mandir@ BINDIR=.bin EXEEXT=@EXEEXT@ -DBGLIB=-L../../$(BINDIR)/Debug/lib -l3270 -RLSLIB=-L../../$(BINDIR)/Release/lib -l3270 +DBGLIB=-L../../$(BINDIR)/Debug@DLLDIR@ -l3270 +RLSLIB=-L../../$(BINDIR)/Release@DLLDIR@ -l3270 TMPDIR=.tmp GLOBAL_DEPS=$(PWD)/include/*.h $(PWD)/include/lib3270/*.h LANG_FILES=$(wildcard po/*.po) @@ -128,11 +128,11 @@ all: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale filelist Release: $(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) locale -$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) +$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(RLSLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Release/$(PACKAGE_TARNAME)$(EXEEXT) -$(BINDIR)/Release/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile - @$(MAKE) BINRLS=../../.bin/Release/lib -C src/lib3270 ../../.bin/Release/lib/@DLLPREFIX@3270@DLLEXT@ +$(BINDIR)/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile + @$(MAKE) BINRLS=../../.bin/Release@DLLDIR@ -C src/lib3270 ../../.bin/Release@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ #---[ File lists ]------------------------------------------------------------- @@ -150,20 +150,20 @@ debian/lib3270-dev.install: Makefile Debug: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) -$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) +$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT): src/pw3270/* $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ $(DEPENDS) @$(MAKE) BINDIR="../../$(BINDIR)" LIB3270_LIBS="$(DBGLIB)" LIB3270_CFLAGS="-I../../src/include" -C src/pw3270 ../../$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) -$(BINDIR)/Debug/lib/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile - @$(MAKE) BINDBG=../../.bin/Debug/lib -C src/lib3270 ../../.bin/Debug/lib/@DLLPREFIX@3270@DLLEXT@ +$(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib3270/* src/include/* Makefile + @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png - @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) ifeq ($(VALGRIND),no) - @PATH="$(BINDIR)/Debug/lib:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" else - @PATH="$(BINDIR)/Debug/lib:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) + @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" G_DEBUG=gc-friendly G_SLICE=always-malloc \$(VALGRIND) --leak-check=full --suppressions=src/pw3270/valgrind.suppression --gen-suppressions=all $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) endif #---[ Targets ]---------------------------------------------------------------- @@ -240,7 +240,7 @@ install-app: install-locale @$(INSTALL_DATA) ui/*.xml $(DESTDIR)$(datarootdir)/$(PACKAGE_NAME)/ui install-lib: - @$(MAKE) BINRLS="../../.bin/Release/lib" -C src/lib3270 install + @$(MAKE) BINRLS="../../.bin/Release@DLLDIR@" -C src/lib3270 install locale: $(foreach MO, $(basename $(LANG_FILES)), $(BINDIR)/Release/$(localedir)/$(notdir $(MO))/LC_MESSAGES/$(PACKAGE_NAME).mo) diff --git a/configure.ac b/configure.ac index 4466daf..01c6ccf 100644 --- a/configure.ac +++ b/configure.ac @@ -104,6 +104,7 @@ DLLEXT=".so" OBJEXT=".o" EXEEXT="" DLLPREFIX="lib" +DLLDIR="/lib" if test $host != $build; then AC_CHECK_PROGS(HOST_CC, gcc cc) @@ -118,6 +119,7 @@ case "$host" in SOCKET_LIBS="-lws2_32" CFLAGS="$CFLAGS -mms-bitfields" DLL_FLAGS="-shared -Wl,-soname,\$(@F)" + DLLDIR="" AC_PATH_TOOL([STRIP], [strip]) ;; @@ -229,6 +231,7 @@ AC_SUBST(DLLPREFIX) AC_SUBST(DLLEXT) AC_SUBST(DLL_FLAGS) AC_SUBST(DLL_CFLAGS) +AC_SUBST(DLLDIR) #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/po/pt_BR.po b/po/pt_BR.po index 2cae353..6babbac 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: pw3270 5.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-07 10:38-0300\n" +"POT-Creation-Date: 2012-08-07 14:57-0300\n" "PO-Revision-Date: 2012-08-03 08:52-0300\n" "Last-Translator: Perry Werneck \n" "Language-Team: Português do Brasil <>\n" diff --git a/src/include/rules.mak.in b/src/include/rules.mak.in index 297c374..35205c2 100644 --- a/src/include/rules.mak.in +++ b/src/include/rules.mak.in @@ -62,11 +62,11 @@ TMPDIR ?= $(ROOTDIR)/.tmp BINDBG ?= $(BINDIR)/Debug BINRLS ?= $(BINDIR)/Release -LIBDBG ?= $(BINDBG)/lib +LIBDBG ?= $(BINDBG)@DLLDIR@ OBJDBG = $(OBJDIR)/Debug OBJRLS = $(OBJDIR)/Release -LIBRLS ?= $(BINRLS)/lib +LIBRLS ?= $(BINRLS)@DLLDIR@ #---[ Rules ]------------------------------------------------------------------ diff --git a/src/lib3270/Makefile.in b/src/lib3270/Makefile.in index f7ef9e1..75d7d28 100644 --- a/src/lib3270/Makefile.in +++ b/src/lib3270/Makefile.in @@ -76,11 +76,11 @@ DEPENDS ?= *.h Makefile BINDBG ?= $(BINDIR)/Debug BINRLS ?= $(BINDIR)/Release -LIBDBG ?= $(BINDIR)/Debug/lib +LIBDBG ?= $(BINDIR)/Debug@DLLDIR@ OBJDBG = $(OBJDIR)/Debug OBJRLS = $(OBJDIR)/Release -LIBRLS = $(OBJDIR)/Release/lib +LIBRLS = $(OBJDIR)/Release@DLLDIR@ #---[ Rules ]------------------------------------------------------------------ diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 962ca10..3c660f5 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -107,7 +107,7 @@ install: Release $(PACKAGE_NAME).desktop $(PACKAGE_NAME)-logo.png $(PACKAGE_NAME).desktop $(BINRLS)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` @$(LD) -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJRLS)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) @@ -126,10 +126,10 @@ $(LIBRLS)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@: $(foreach SRC, $(base Debug: $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT) $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@ \ - $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) + $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - @$(LD) -Wl,--rpath,.bin/Debug/lib -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) + $(LD) -Wl,--rpath,.bin/Debug@DLLDIR@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @rm -f $@ -- libgit2 0.21.2