From 29238cbbd2fcc9d147eccb43a2056e74d8a8b5c6 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 24 May 2016 11:04:40 -0300 Subject: [PATCH] Ajustes para compilar no formato novo. --- configure.ac | 10 ++++++++++ src/classlib/class.mak.in | 5 +++-- src/include/plugin.mak.in | 27 +++++++++++++-------------- src/include/rules.mak.in | 2 +- src/java/Makefile.in | 6 ++---- src/java/call.cc | 2 +- src/java/plugin.cc | 2 +- src/java/startstop.cc | 2 +- src/plugins/dbus3270/Makefile.in | 17 +++++++++-------- src/plugins/dbus3270/gobject.c | 2 +- src/plugins/hllapi/pluginmain.c | 2 +- src/plugins/rx3270/pluginmain.cc | 2 +- src/pw3270/Makefile.in | 2 +- src/pw3270/dialog.c | 2 +- src/pw3270/globals.h | 2 +- src/pw3270/hostdialog.c | 2 +- src/pw3270/main.c | 2 +- src/pw3270/print.c | 2 +- src/pw3270/uiparser/action.c | 2 +- src/pw3270/uiparser/button.c | 2 +- src/pw3270/uiparser/parser.c | 2 +- src/pw3270/v3270/accessible.c | 2 +- src/pw3270/v3270/draw.c | 2 +- src/pw3270/v3270/hostselect.c | 2 +- src/pw3270/v3270/keyboard.c | 2 +- src/pw3270/v3270/mouse.c | 2 +- src/pw3270/v3270/oia.c | 2 +- src/pw3270/v3270/private.h | 2 +- src/pw3270/v3270/properties.c | 2 +- src/pw3270/v3270/selection.c | 2 +- src/pw3270/v3270/widget.c | 2 +- src/pw3270/v3270ft/Makefile.in | 11 +++++------ src/pw3270/v3270ft/transfer.c | 2 +- 33 files changed, 69 insertions(+), 61 deletions(-) diff --git a/configure.ac b/configure.ac index 9d0b3cf..e6dadad 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,14 @@ esac # It's easier to test hllapi on linux AC_CONFIG_FILES(src/plugins/hllapi/Makefile) +#--[ lib3270 defines ]---------------------------------------------------------------------------------------------------------------------------------------- + +LIB3270_CFLAGS=-I$ac_pwd/src/include +PW3270_CFLAGS=-I$ac_pwd/src/pw3270/include + +AC_SUBST(LIB3270_CFLAGS) +AC_SUBST(PW3270_CFLAGS) + #--[ Check gettext ]------------------------------------------------------------------------------------------------------------------------------------------ AC_PATH_TOOL([XGETTEXT], [xgettext], [no]) @@ -540,6 +548,8 @@ AC_CHECK_FUNCS(getaddrinfo, AC_DEFINE(HAVE_GETADDRINFO) ) AC_CHECK_FUNC(vasprintf, AC_DEFINE(HAVE_VASPRINTF) ) AC_CHECK_FUNC(strtok_r, AC_DEFINE(HAVE_STRTOK_R) ) + + PKG_CHECK_EXISTS #--[ GTK 2/3 check ]------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/src/classlib/class.mak.in b/src/classlib/class.mak.in index 3fa88d6..82cc9d3 100644 --- a/src/classlib/class.mak.in +++ b/src/classlib/class.mak.in @@ -37,9 +37,10 @@ CLASS_RELEASE_OBJECTS=$(foreach SRC, $(basename $(CLASS_SRC)), $(OBJRLS)/classli $(OBJDBG)/classlib/%.o: $(CLASSLIBDIR)/%.cc @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $< + @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(DEBUG_CFLAGS) -o $@ -c $< $(OBJRLS)/classlib/%.o: $(CLASSLIBDIR)/%.cc @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) -o $@ -c $< + @$(CXX) $(CLASS_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) -o $@ -c $< + diff --git a/src/include/plugin.mak.in b/src/include/plugin.mak.in index 1fbd77c..c0b5fbf 100644 --- a/src/include/plugin.mak.in +++ b/src/include/plugin.mak.in @@ -74,27 +74,26 @@ LIB3270_MODE ?= Default DLL_NAME ?= @DLLDIR@/@DLLPREFIX@$(MODULE_NAME)@DLLEXT@ PLUGIN_NAME ?= plugins/$(MODULE_NAME)@DLLEXT@ +PW3270_CFLAGS=@PW3270_CFLAGS@ +LIB3270_CFLAGS=@LIB3270_CFLAGS@ + ifeq ($(LIB3270_MODE),Debug) PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME) - PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 - LIB270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) BINRLS=../../../.bin/Release PW3270_LIBS=-L$(BINRLS)@DLLDIR@ -l$(PACKAGE_TARNAME) - PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L$(BINRLS)@DLLDIR@ -l3270 - LIB270_CFLAGS=-I../../../src/include endif -ifeq ($(LIB3270_MODE),Default) - LIB3270_LIBS ?= `pkg-config --libs lib3270` - LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` - PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270` - PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270` -endif +#ifeq ($(LIB3270_MODE),Default) +# LIB3270_LIBS ?= `pkg-config --libs lib3270` +# LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` +# PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270` +# PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270` +#endif GTK_CFLAGS ?= @GTK_CFLAGS@ @GTKMAC_CFLAGS@ GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@ @@ -102,22 +101,22 @@ GTK_LIBS ?= @GTK_LIBS@ @GTKMAC_LIBS@ $(OBJDBG)/%.o: %.c $(DEPENDS) @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< + @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< $(OBJDBG)/%.o: %.cc $(DEPENDS) @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< + @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(DEBUG_CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< $(OBJRLS)/%.o: %.c $(DEPENDS) @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< + @$(CC) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< $(OBJRLS)/%.o: %.cc $(DEPENDS) @echo " CC `basename $@`" @$(MKDIR) `dirname $@` - @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< + @$(CXX) $(DLL_CFLAGS) $(CFLAGS) $(PW3270_CFLAGS) $(LIB3270_CFLAGS) $(GTK_CFLAGS) -o $@ -c $< #---[ Targets ]---------------------------------------------------------------- diff --git a/src/include/rules.mak.in b/src/include/rules.mak.in index f367d99..ccc40b6 100644 --- a/src/include/rules.mak.in +++ b/src/include/rules.mak.in @@ -34,7 +34,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@ PACKAGE_TARNAME=@PACKAGE_TARNAME@ EXEEXT=@EXEEXT@ -LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` +LIB3270_CFLAGS ?= @LIB3270_CFLAGS@ LIB3270_LIBS ?= `pkg-config --libs lib3270` DLL_FLAGS=@DLL_FLAGS@ diff --git a/src/java/Makefile.in b/src/java/Makefile.in index 7dc7b2b..df05925 100644 --- a/src/java/Makefile.in +++ b/src/java/Makefile.in @@ -72,7 +72,6 @@ OBJRLS ?= $(OBJDIR)/Release #---[ lib3270 common class ]--------------------------------------------------- DEBUG_CFLAGS=-DDEBUG=1 -g -Wall -PW3270_CFLAGS=-I../include CLASSLIBDIR=../classlib include $(CLASSLIBDIR)/class.mak @@ -80,11 +79,10 @@ include $(CLASSLIBDIR)/class.mak CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include -PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 -PW3270_CFLAGS ?= -I../include +PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 PLUGIN_CFLAGS=@CXXFLAGS@ -DPW3270_PLUGIN -Wno-deprecated-declarations @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \ - -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ $(PW3270_CFLAGS) + -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ @PW3270_CFLAGS@ @LIB3270_CFLAGS@ PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @INTL_LIBS@ @JVM_LIBS@ diff --git a/src/java/call.cc b/src/java/call.cc index debb49b..cb93b20 100644 --- a/src/java/call.cc +++ b/src/java/call.cc @@ -29,7 +29,7 @@ #include "private.h" - #include + #include #include #include diff --git a/src/java/plugin.cc b/src/java/plugin.cc index 5f75d15..75ae735 100644 --- a/src/java/plugin.cc +++ b/src/java/plugin.cc @@ -51,7 +51,7 @@ #include #include - #include + #include #include #include #include diff --git a/src/java/startstop.cc b/src/java/startstop.cc index 4891147..3f5ba85 100644 --- a/src/java/startstop.cc +++ b/src/java/startstop.cc @@ -50,7 +50,7 @@ #include #include - #include + #include #include #include #include diff --git a/src/plugins/dbus3270/Makefile.in b/src/plugins/dbus3270/Makefile.in index 78c956e..1b5dbe7 100644 --- a/src/plugins/dbus3270/Makefile.in +++ b/src/plugins/dbus3270/Makefile.in @@ -81,11 +81,12 @@ GDBUS_LIBS=@GDBUS_LIBS@ GLIB_LIBS=@GLIB_LIBS@ GTK_LIBS=@GTK_LIBS@ +PW3270_CFLAGS=@PW3270_CFLAGS@ +LIB3270_CFLAGS=@LIB3270_CFLAGS@ + ifeq ($(LIB3270_MODE),Debug) PW3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l$(PACKAGE_TARNAME) - PW3270_CFLAGS=-I../../../src/include LIB3270_LIBS=-L../../../.bin/Debug@DLLDIR@ -l3270 - LIB3270_CFLAGS=-I../../../src/include endif ifeq ($(LIB3270_MODE),Release) @@ -95,12 +96,12 @@ ifeq ($(LIB3270_MODE),Release) LIB3270_CFLAGS=-I../../../src/include endif -ifeq ($(LIB3270_MODE),Default) - LIB3270_LIBS ?= `pkg-config --libs lib3270` - LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` - PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270` - PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270` -endif +#ifeq ($(LIB3270_MODE),Default) +# LIB3270_LIBS ?= `pkg-config --libs lib3270` +# LIB3270_CFLAGS ?= `pkg-config --cflags lib3270` +# PW3270_LIBS ?= `pkg-config --libs pw3270 lib3270` +# PW3270_CFLAGS ?= `pkg-config --cflags pw3270 lib3270` +#endif #---[ Rules ]------------------------------------------------------------------ diff --git a/src/plugins/dbus3270/gobject.c b/src/plugins/dbus3270/gobject.c index eaab202..2c11014 100644 --- a/src/plugins/dbus3270/gobject.c +++ b/src/plugins/dbus3270/gobject.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/plugins/hllapi/pluginmain.c b/src/plugins/hllapi/pluginmain.c index 9803f6e..a024b4b 100644 --- a/src/plugins/hllapi/pluginmain.c +++ b/src/plugins/hllapi/pluginmain.c @@ -38,7 +38,7 @@ #endif // _WIN32 #include - #include + #include #include #include #include diff --git a/src/plugins/rx3270/pluginmain.cc b/src/plugins/rx3270/pluginmain.cc index 49c7056..f1984f2 100644 --- a/src/plugins/rx3270/pluginmain.cc +++ b/src/plugins/rx3270/pluginmain.cc @@ -44,7 +44,7 @@ #include #include #include - #include + #include #include #include #include diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index b10162e..38d301c 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -177,7 +177,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): \ .bin/Debug/v3270ft.a: \ v3270ft/* - $(MAKE) BINDIR=../.bin -C v3270ft Debug + @$(MAKE) BINDIR=../.bin -C v3270ft Debug $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: \ diff --git a/src/pw3270/dialog.c b/src/pw3270/dialog.c index fb6ea6c..211fd39 100644 --- a/src/pw3270/dialog.c +++ b/src/pw3270/dialog.c @@ -31,7 +31,7 @@ #include #include "globals.h" - #include + #include #if defined(HAVE_LIBSSL) #include diff --git a/src/pw3270/globals.h b/src/pw3270/globals.h index fdd8ec3..de4e4d7 100644 --- a/src/pw3270/globals.h +++ b/src/pw3270/globals.h @@ -36,7 +36,7 @@ #include #include - #include + #include // Special actions enum diff --git a/src/pw3270/hostdialog.c b/src/pw3270/hostdialog.c index 0b46058..c8310b5 100644 --- a/src/pw3270/hostdialog.c +++ b/src/pw3270/hostdialog.c @@ -28,7 +28,7 @@ */ #include "globals.h" - #include + #include /*--[ Globals ]--------------------------------------------------------------------------------------*/ diff --git a/src/pw3270/main.c b/src/pw3270/main.c index fe72e9f..6f90674 100644 --- a/src/pw3270/main.c +++ b/src/pw3270/main.c @@ -37,7 +37,7 @@ #include #endif // HAVE_GTKMAC -#include +#include #include #include "v3270/accessible.h" #include diff --git a/src/pw3270/print.c b/src/pw3270/print.c index ed1ac64..0818e02 100644 --- a/src/pw3270/print.c +++ b/src/pw3270/print.c @@ -30,7 +30,7 @@ */ #include "globals.h" - #include + #include #include #include diff --git a/src/pw3270/uiparser/action.c b/src/pw3270/uiparser/action.c index 12f822b..18e4cb8 100644 --- a/src/pw3270/uiparser/action.c +++ b/src/pw3270/uiparser/action.c @@ -30,7 +30,7 @@ */ #include - #include + #include #include "private.h" /*--[ Implement ]------------------------------------------------------------------------------------*/ diff --git a/src/pw3270/uiparser/button.c b/src/pw3270/uiparser/button.c index e849774..7b57b35 100644 --- a/src/pw3270/uiparser/button.c +++ b/src/pw3270/uiparser/button.c @@ -29,7 +29,7 @@ */ #include "keypad.h" - #include + #include /*--[ Globals ]--------------------------------------------------------------------------------------*/ diff --git a/src/pw3270/uiparser/parser.c b/src/pw3270/uiparser/parser.c index 736531a..5b0ceaf 100644 --- a/src/pw3270/uiparser/parser.c +++ b/src/pw3270/uiparser/parser.c @@ -30,7 +30,7 @@ */ #include "private.h" - #include + #include #ifdef HAVE_GTKMAC #include diff --git a/src/pw3270/v3270/accessible.c b/src/pw3270/v3270/accessible.c index 779276c..28a102a 100644 --- a/src/pw3270/v3270/accessible.c +++ b/src/pw3270/v3270/accessible.c @@ -38,7 +38,7 @@ #include #include - #include + #include #include "private.h" #include "accessible.h" diff --git a/src/pw3270/v3270/draw.c b/src/pw3270/v3270/draw.c index 1e1a363..39a9154 100644 --- a/src/pw3270/v3270/draw.c +++ b/src/pw3270/v3270/draw.c @@ -32,7 +32,7 @@ #include #include #include - #include + #include #include "private.h" /*--[ Implement ]------------------------------------------------------------------------------------*/ diff --git a/src/pw3270/v3270/hostselect.c b/src/pw3270/v3270/hostselect.c index 6ac1bce..a3ab1e3 100644 --- a/src/pw3270/v3270/hostselect.c +++ b/src/pw3270/v3270/hostselect.c @@ -29,7 +29,7 @@ #include "hostselect.h" #include - #include + #include /*--[ Widget definition ]----------------------------------------------------------------------------*/ diff --git a/src/pw3270/v3270/keyboard.c b/src/pw3270/v3270/keyboard.c index 319fd0e..3645d56 100644 --- a/src/pw3270/v3270/keyboard.c +++ b/src/pw3270/v3270/keyboard.c @@ -38,7 +38,7 @@ #include #include - #include + #include #include "private.h" #if GTK_CHECK_VERSION(3,0,0) diff --git a/src/pw3270/v3270/mouse.c b/src/pw3270/v3270/mouse.c index 6293b14..70d3fff 100644 --- a/src/pw3270/v3270/mouse.c +++ b/src/pw3270/v3270/mouse.c @@ -30,7 +30,7 @@ #include #include #include - #include + #include #include "private.h" #include #include diff --git a/src/pw3270/v3270/oia.c b/src/pw3270/v3270/oia.c index 6d340cb..5013310 100644 --- a/src/pw3270/v3270/oia.c +++ b/src/pw3270/v3270/oia.c @@ -41,7 +41,7 @@ #include #endif // HAVE_LIBM - #include + #include #include "private.h" #include "accessible.h" diff --git a/src/pw3270/v3270/private.h b/src/pw3270/v3270/private.h index c9590e1..80feaa1 100644 --- a/src/pw3270/v3270/private.h +++ b/src/pw3270/v3270/private.h @@ -36,7 +36,7 @@ #include #ifndef V3270_H_INCLUDED - #include + #include #endif G_BEGIN_DECLS diff --git a/src/pw3270/v3270/properties.c b/src/pw3270/v3270/properties.c index e9bd616..b7a46fd 100644 --- a/src/pw3270/v3270/properties.c +++ b/src/pw3270/v3270/properties.c @@ -34,7 +34,7 @@ #include #include #include - #include + #include #include "private.h" /*--[ Globals ]--------------------------------------------------------------------------------------*/ diff --git a/src/pw3270/v3270/selection.c b/src/pw3270/v3270/selection.c index 3e80dfe..6595ba8 100644 --- a/src/pw3270/v3270/selection.c +++ b/src/pw3270/v3270/selection.c @@ -29,7 +29,7 @@ #include #include - #include + #include #include "private.h" #include #include diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c index 6f4d626..ec9b6d8 100644 --- a/src/pw3270/v3270/widget.c +++ b/src/pw3270/v3270/widget.c @@ -40,7 +40,7 @@ #include #endif // HAVE_MALLOC_H - #include + #include #include "private.h" #include "accessible.h" #include "marshal.h" diff --git a/src/pw3270/v3270ft/Makefile.in b/src/pw3270/v3270ft/Makefile.in index 43685f9..7a0c038 100644 --- a/src/pw3270/v3270ft/Makefile.in +++ b/src/pw3270/v3270ft/Makefile.in @@ -64,24 +64,23 @@ DOXYGEN=@DOXYGEN@ AMTAR=@AMTAR@ SHELL=@SHELL@ MKDIR=@MKDIR_P@ -GENMARSHAL=glib-genmarshal +GENMARSHAL=@GENMARSHAL@ CC=@CC@ LD=@CC@ AR=@AR@ -LIB3270_CFLAGS=@LIB3270_CFLAGS@ -LIB3270_LIBS=@LIB3270_LIBS@ - GTK_CFLAGS=@GTK_CFLAGS@ GTK_LIBS=@GTK_LIBS@ GLIB_CFLAGS=@GLIB_CFLAGS@ GLIB_LIBS=@GLIB_LIBS@ -CFLAGS=@CFLAGS@ @DLL_CFLAGS@ \ - -I../include \ +CFLAGS=@CFLAGS@ \ + @DLL_CFLAGS@ \ -DBUILD_DATE=`date +"0x%Y%m%d"` \ + @LIB3270_CFLAGS@ \ + @PW3270_CFLAGS@ \ $(GTK_CFLAGS) LIBS=@LIBS@ $(GTK_LIBS) diff --git a/src/pw3270/v3270ft/transfer.c b/src/pw3270/v3270ft/transfer.c index 4ab23ed..2150166 100644 --- a/src/pw3270/v3270ft/transfer.c +++ b/src/pw3270/v3270ft/transfer.c @@ -28,7 +28,7 @@ * */ - #include + #include #include "private.h" -- libgit2 0.21.2