From 5f00f1c13ed7bebdfa65b03ba841a6352d3f15b1 Mon Sep 17 00:00:00 2001 From: Perry Werneck Date: Tue, 4 Dec 2018 15:30:46 -0200 Subject: [PATCH] Updating Makefile --- Makefile.in | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- configure.ac | 10 +++++----- src/include/config.h.in | 43 +++++++++++++++++++++++++++++++++++++++++++ src/v3270/marshal | 13 +++++++++++++ src/v3270/v3270.marshal | 13 ------------- src/v3270ft/marshal | 1 + src/v3270ft/v3270ft.marshal | 1 - 7 files changed, 140 insertions(+), 27 deletions(-) create mode 100644 src/include/config.h.in create mode 100644 src/v3270/marshal delete mode 100644 src/v3270/v3270.marshal create mode 100644 src/v3270ft/marshal delete mode 100644 src/v3270ft/v3270ft.marshal diff --git a/Makefile.in b/Makefile.in index 172db8b..8e5769a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,7 @@ MSGCAT=@MSGCAT@ WINDRES=@WINDRES@ AR=@AR@ VALGRIND=@VALGRIND@ +GENMARSHAL=@GENMARSHAL@ #---[ Paths ]---------------------------------------------------------------------------- @@ -84,20 +85,24 @@ DEPENDS= \ src/include/*.h \ src/include/v3270/*.h \ src/v3270/*.h \ - src/v3270ft/*.h + src/v3270ft/*.h \ + src/v3270/marshal.h \ + src/v3270ft/marshal.h CFLAGS= \ @CFLAGS@ \ -g \ - -I../include + -Isrc/include \ -DBUILD_DATE=`date +%Y%m%d` \ - @LIBSSL_CFLAGS@ + @GTK_CFLAGS@ \ + @GLIB_CFLAGS@ LIBS= \ @LIBS@ \ - @LIBSSL_LIBS@ \ - @LIBICONV@ \ - @INTL_LIBS@ + @GTK_LIBS@ \ + @GLIB_LIBS@ \ + @INTL_LIBS@ \ + -l3270 #---[ Debug Rules ]---------------------------------------------------------------------- @@ -107,6 +112,7 @@ $(OBJDBG)/%.o: \ @echo $< ... @$(MKDIR) `dirname $@` + @$(CC) \ $(CFLAGS) \ -Wall -Wextra -fstack-check \ @@ -163,6 +169,55 @@ $(POTDIR)/$(LIBNAME)/%.pot: \ @$(MKDIR) `dirname $@` @touch $@ +#---[ Marshal Targets ]------------------------------------------------------------------ + +src/v3270/marshal.h: \ + src/v3270/marshal + + @echo $@ ... + @$(MKDIR) `dirname $@` + + @$(GENMARSHAL) --prefix=v3270 --header $< > $@ + +$(OBJDIR)/marshal/v3270.c: \ + src/v3270/marshal + + @echo $@ ... + @$(MKDIR) `dirname $@` + + @$(GENMARSHAL) --prefix=v3270 --body $< > $@ + + +src/v3270ft/marshal.h: \ + src/v3270ft/marshal + + @echo $@ ... + @$(MKDIR) `dirname $@` + + @$(GENMARSHAL) --prefix=v3270ft --header $< > $@ + +$(OBJDIR)/marshal/v3270ft.c: \ + src/v3270ft/marshal + + @echo $@ ... + @$(MKDIR) `dirname $@` + + @$(GENMARSHAL) --prefix=v3270ft --body $< > $@ + +$(OBJDIR)/marshal/%.o: \ + $(OBJDIR)/marshal/%.c \ + $(DEPENDS) + + @echo $< ... + @$(MKDIR) `dirname $@` + + @$(CC) \ + $(CFLAGS) \ + -Wall -Wextra -fstack-check \ + -DDEBUG=1 \ + -o $@ -c $< + + #---[ Release Targets ]------------------------------------------------------------------ all: \ @@ -193,7 +248,9 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ $@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ + $(OBJDIR)/marshal/v3270.o \ + $(OBJDIR)/marshal/v3270ft.o @$(MKDIR) `dirname $@` @echo $< ... @@ -202,6 +259,8 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ -o $@ \ $(LDFLAGS) \ $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ + $(OBJDIR)/marshal/v3270.o \ + $(OBJDIR)/marshal/v3270ft.o \ $(LIBS) $(BINRLS)/static/$(LIBNAME).a: \ @@ -319,7 +378,9 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ $@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ + $(OBJDIR)/marshal/v3270.o \ + $(OBJDIR)/marshal/v3270ft.o @$(MKDIR) `dirname $@` @echo $< ... @@ -328,6 +389,8 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ -o $@ \ $(LDFLAGS) \ $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ + $(OBJDIR)/marshal/v3270.o \ + $(OBJDIR)/marshal/v3270ft.o \ $(LIBS) #---[ Clean Targets ]-------------------------------------------------------------------- @@ -338,17 +401,24 @@ clean: \ @rm -fr $(BASEDIR)/.tmp/$(LIBNAME) @rm -fr $(POTDIR)/$(LIBNAME) + @rm -fr src/include/marshal cleanDebug: @rm -fr $(OBJDBG) @rm -fr $(BINDBG) + @rm -fr $(OBJDIR)/marshal + @rm -f src/v3270/marshal.h + @rm -f src/v3270ft/marshal.h cleanRelease: @rm -fr $(OBJRLS) @rm -fr $(BINRLS) @rm -fr $(POTDIR) + @rm -fr $(OBJDIR)/marshal + @rm -f src/v3270/marshal.h + @rm -f src/v3270ft/marshal.h @rm -f lib$(LIBNAME).pot clean: \ diff --git a/configure.ac b/configure.ac index 6ce5b31..805a060 100644 --- a/configure.ac +++ b/configure.ac @@ -178,9 +178,7 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no]) AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) AC_PATH_TOOL([VALGRIND], [valgrind], [no]) -AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no]) -AC_PATH_TOOL([CONVERT], [convert], [no]) -AC_PATH_TOOL([OPTIPNG],[optipng],[no]) +AC_PATH_TOOL([GENMARSHAL], [glib-genmarshal], [glib-genmarshal]) AC_CHECK_HEADER(libintl.h, [ AC_DEFINE(HAVE_LIBINTL, 1) @@ -203,18 +201,20 @@ dnl --------------------------------------------------------------------------- dnl Check for GTK dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.] ) +PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.])) AC_SUBST(GTK_LIBS) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_VERSION) AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`) + + dnl --------------------------------------------------------------------------- dnl Check for GLIB dnl --------------------------------------------------------------------------- -PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB), AC_MSG_ERROR([GLIB not present.] ) +PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB), AC_MSG_ERROR([GLIB not present.] )) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) diff --git a/src/include/config.h.in b/src/include/config.h.in new file mode 100644 index 0000000..2bfd3c2 --- /dev/null +++ b/src/include/config.h.in @@ -0,0 +1,43 @@ +/* + * "Software G3270, 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> + * + * 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 + * Free Software Foundation. + * + * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER + * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO + * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para + * 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., 51 Franklin + * St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Este programa está nomeado como config.h e possui - linhas de código. + * + * Contatos: + * + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck) + * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça) + * + */ + +#ifndef LIBV3270_CONFIG_INCLUDED + + #define LIBV3270_CONFIG_INCLUDED 1 + + #undef PACKAGE_NAME + #undef PACKAGE_VERSION + #undef PACKAGE_RELEASE + + #undef HAVE_GNUC_VISIBILITY + + #undef HAVE_GNOME + #undef HAVE_GTKMAC + +#endif /* LIBV3270_CONFIG_INCLUDED */ diff --git a/src/v3270/marshal b/src/v3270/marshal new file mode 100644 index 0000000..0840b39 --- /dev/null +++ b/src/v3270/marshal @@ -0,0 +1,13 @@ +VOID:VOID +VOID:VOID,ENUM,BOOLEAN,POINTER +VOID:VOID,ENUM +VOID:VOID,POINTER +VOID:POINTER +VOID:VOID,POINTER,POINTER +VOID:VOID,UINT,POINTER +BOOLEAN:VOID,UINT,ENUM +VOID:VOID,BOOLEAN +BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER +VOID:VOID,UINT,UINT +VOID:VOID,UINT,POINTER,POINTER,POINTER +BOOLEAN:VOID,BOOLEAN,UINT,POINTER diff --git a/src/v3270/v3270.marshal b/src/v3270/v3270.marshal deleted file mode 100644 index 0840b39..0000000 --- a/src/v3270/v3270.marshal +++ /dev/null @@ -1,13 +0,0 @@ -VOID:VOID -VOID:VOID,ENUM,BOOLEAN,POINTER -VOID:VOID,ENUM -VOID:VOID,POINTER -VOID:POINTER -VOID:VOID,POINTER,POINTER -VOID:VOID,UINT,POINTER -BOOLEAN:VOID,UINT,ENUM -VOID:VOID,BOOLEAN -BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER -VOID:VOID,UINT,UINT -VOID:VOID,UINT,POINTER,POINTER,POINTER -BOOLEAN:VOID,BOOLEAN,UINT,POINTER diff --git a/src/v3270ft/marshal b/src/v3270ft/marshal new file mode 100644 index 0000000..cd48853 --- /dev/null +++ b/src/v3270ft/marshal @@ -0,0 +1 @@ +VOID:POINTER,POINTER diff --git a/src/v3270ft/v3270ft.marshal b/src/v3270ft/v3270ft.marshal deleted file mode 100644 index cd48853..0000000 --- a/src/v3270ft/v3270ft.marshal +++ /dev/null @@ -1 +0,0 @@ -VOID:POINTER,POINTER -- libgit2 0.21.2