Download as
Browse Code »

Commit 5f00f1c13ed7bebdfa65b03ba841a6352d3f15b1

Authored by Perry Werneck
1 parent d822eaaa
Exists in master and in 1 other branch develop

Updating Makefile

Showing 7 changed files with 140 additions and 27 deletions   Show diff stats
@@ -51,6 +51,7 @@ MSGCAT=@MSGCAT@ @@ -51,6 +51,7 @@ MSGCAT=@MSGCAT@
51 WINDRES=@WINDRES@ 51 WINDRES=@WINDRES@
52 AR=@AR@ 52 AR=@AR@
53 VALGRIND=@VALGRIND@ 53 VALGRIND=@VALGRIND@
  54 +GENMARSHAL=@GENMARSHAL@
54 55
55 #---[ Paths ]---------------------------------------------------------------------------- 56 #---[ Paths ]----------------------------------------------------------------------------
56 57
@@ -84,20 +85,24 @@ DEPENDS= \ @@ -84,20 +85,24 @@ DEPENDS= \
84 src/include/*.h \ 85 src/include/*.h \
85 src/include/v3270/*.h \ 86 src/include/v3270/*.h \
86 src/v3270/*.h \ 87 src/v3270/*.h \
87 - src/v3270ft/*.h 88 + src/v3270ft/*.h \
  89 + src/v3270/marshal.h \
  90 + src/v3270ft/marshal.h
88 91
89 CFLAGS= \ 92 CFLAGS= \
90 @CFLAGS@ \ 93 @CFLAGS@ \
91 -g \ 94 -g \
92 - -I../include 95 + -Isrc/include \
93 -DBUILD_DATE=`date +%Y%m%d` \ 96 -DBUILD_DATE=`date +%Y%m%d` \
94 - @LIBSSL_CFLAGS@ 97 + @GTK_CFLAGS@ \
  98 + @GLIB_CFLAGS@
95 99
96 LIBS= \ 100 LIBS= \
97 @LIBS@ \ 101 @LIBS@ \
98 - @LIBSSL_LIBS@ \  
99 - @LIBICONV@ \  
100 - @INTL_LIBS@ 102 + @GTK_LIBS@ \
  103 + @GLIB_LIBS@ \
  104 + @INTL_LIBS@ \
  105 + -l3270
101 106
102 #---[ Debug Rules ]---------------------------------------------------------------------- 107 #---[ Debug Rules ]----------------------------------------------------------------------
103 108
@@ -107,6 +112,7 @@ $(OBJDBG)/%.o: \ @@ -107,6 +112,7 @@ $(OBJDBG)/%.o: \
107 112
108 @echo $< ... 113 @echo $< ...
109 @$(MKDIR) `dirname $@` 114 @$(MKDIR) `dirname $@`
  115 +
110 @$(CC) \ 116 @$(CC) \
111 $(CFLAGS) \ 117 $(CFLAGS) \
112 -Wall -Wextra -fstack-check \ 118 -Wall -Wextra -fstack-check \
@@ -163,6 +169,55 @@ $(POTDIR)/$(LIBNAME)/%.pot: \ @@ -163,6 +169,55 @@ $(POTDIR)/$(LIBNAME)/%.pot: \
163 @$(MKDIR) `dirname $@` 169 @$(MKDIR) `dirname $@`
164 @touch $@ 170 @touch $@
165 171
  172 +#---[ Marshal Targets ]------------------------------------------------------------------
  173 +
  174 +src/v3270/marshal.h: \
  175 + src/v3270/marshal
  176 +
  177 + @echo $@ ...
  178 + @$(MKDIR) `dirname $@`
  179 +
  180 + @$(GENMARSHAL) --prefix=v3270 --header $< > $@
  181 +
  182 +$(OBJDIR)/marshal/v3270.c: \
  183 + src/v3270/marshal
  184 +
  185 + @echo $@ ...
  186 + @$(MKDIR) `dirname $@`
  187 +
  188 + @$(GENMARSHAL) --prefix=v3270 --body $< > $@
  189 +
  190 +
  191 +src/v3270ft/marshal.h: \
  192 + src/v3270ft/marshal
  193 +
  194 + @echo $@ ...
  195 + @$(MKDIR) `dirname $@`
  196 +
  197 + @$(GENMARSHAL) --prefix=v3270ft --header $< > $@
  198 +
  199 +$(OBJDIR)/marshal/v3270ft.c: \
  200 + src/v3270ft/marshal
  201 +
  202 + @echo $@ ...
  203 + @$(MKDIR) `dirname $@`
  204 +
  205 + @$(GENMARSHAL) --prefix=v3270ft --body $< > $@
  206 +
  207 +$(OBJDIR)/marshal/%.o: \
  208 + $(OBJDIR)/marshal/%.c \
  209 + $(DEPENDS)
  210 +
  211 + @echo $< ...
  212 + @$(MKDIR) `dirname $@`
  213 +
  214 + @$(CC) \
  215 + $(CFLAGS) \
  216 + -Wall -Wextra -fstack-check \
  217 + -DDEBUG=1 \
  218 + -o $@ -c $<
  219 +
  220 +
166 #---[ Release Targets ]------------------------------------------------------------------ 221 #---[ Release Targets ]------------------------------------------------------------------
167 222
168 all: \ 223 all: \
@@ -193,7 +248,9 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -193,7 +248,9 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
193 $@ 248 $@
194 249
195 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 250 $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
196 - $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) 251 + $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
  252 + $(OBJDIR)/marshal/v3270.o \
  253 + $(OBJDIR)/marshal/v3270ft.o
197 254
198 @$(MKDIR) `dirname $@` 255 @$(MKDIR) `dirname $@`
199 @echo $< ... 256 @echo $< ...
@@ -202,6 +259,8 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -202,6 +259,8 @@ $(BINRLS)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
202 -o $@ \ 259 -o $@ \
203 $(LDFLAGS) \ 260 $(LDFLAGS) \
204 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \ 261 $(foreach SRC, $(basename $(SOURCES)), $(OBJRLS)/$(SRC).o) \
  262 + $(OBJDIR)/marshal/v3270.o \
  263 + $(OBJDIR)/marshal/v3270ft.o \
205 $(LIBS) 264 $(LIBS)
206 265
207 $(BINRLS)/static/$(LIBNAME).a: \ 266 $(BINRLS)/static/$(LIBNAME).a: \
@@ -319,7 +378,9 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \ @@ -319,7 +378,9 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@: \
319 $@ 378 $@
320 379
321 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ 380 $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
322 - $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) 381 + $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
  382 + $(OBJDIR)/marshal/v3270.o \
  383 + $(OBJDIR)/marshal/v3270ft.o
323 384
324 @$(MKDIR) `dirname $@` 385 @$(MKDIR) `dirname $@`
325 @echo $< ... 386 @echo $< ...
@@ -328,6 +389,8 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \ @@ -328,6 +389,8 @@ $(BINDBG)/$(LIBNAME)@DLLEXT@.@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@: \
328 -o $@ \ 389 -o $@ \
329 $(LDFLAGS) \ 390 $(LDFLAGS) \
330 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \ 391 $(foreach SRC, $(basename $(SOURCES)), $(OBJDBG)/$(SRC).o) \
  392 + $(OBJDIR)/marshal/v3270.o \
  393 + $(OBJDIR)/marshal/v3270ft.o \
331 $(LIBS) 394 $(LIBS)
332 395
333 #---[ Clean Targets ]-------------------------------------------------------------------- 396 #---[ Clean Targets ]--------------------------------------------------------------------
@@ -338,17 +401,24 @@ clean: \ @@ -338,17 +401,24 @@ clean: \
338 401
339 @rm -fr $(BASEDIR)/.tmp/$(LIBNAME) 402 @rm -fr $(BASEDIR)/.tmp/$(LIBNAME)
340 @rm -fr $(POTDIR)/$(LIBNAME) 403 @rm -fr $(POTDIR)/$(LIBNAME)
  404 + @rm -fr src/include/marshal
341 405
342 cleanDebug: 406 cleanDebug:
343 407
344 @rm -fr $(OBJDBG) 408 @rm -fr $(OBJDBG)
345 @rm -fr $(BINDBG) 409 @rm -fr $(BINDBG)
  410 + @rm -fr $(OBJDIR)/marshal
  411 + @rm -f src/v3270/marshal.h
  412 + @rm -f src/v3270ft/marshal.h
346 413
347 cleanRelease: 414 cleanRelease:
348 415
349 @rm -fr $(OBJRLS) 416 @rm -fr $(OBJRLS)
350 @rm -fr $(BINRLS) 417 @rm -fr $(BINRLS)
351 @rm -fr $(POTDIR) 418 @rm -fr $(POTDIR)
  419 + @rm -fr $(OBJDIR)/marshal
  420 + @rm -f src/v3270/marshal.h
  421 + @rm -f src/v3270ft/marshal.h
352 @rm -f lib$(LIBNAME).pot 422 @rm -f lib$(LIBNAME).pot
353 423
354 clean: \ 424 clean: \
@@ -178,9 +178,7 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no]) @@ -178,9 +178,7 @@ AC_PATH_TOOL([MSGINIT], [msginit], [no])
178 AC_PATH_TOOL([MSGMERGE], [msgmerge], [no]) 178 AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
179 AC_PATH_TOOL([MSGFMT], [msgfmt], [no]) 179 AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
180 AC_PATH_TOOL([VALGRIND], [valgrind], [no]) 180 AC_PATH_TOOL([VALGRIND], [valgrind], [no])
181 -AC_PATH_TOOL([SVG2PNG],[rsvg-convert],[no])  
182 -AC_PATH_TOOL([CONVERT], [convert], [no])  
183 -AC_PATH_TOOL([OPTIPNG],[optipng],[no]) 181 +AC_PATH_TOOL([GENMARSHAL], [glib-genmarshal], [glib-genmarshal])
184 182
185 AC_CHECK_HEADER(libintl.h, [ 183 AC_CHECK_HEADER(libintl.h, [
186 AC_DEFINE(HAVE_LIBINTL, 1) 184 AC_DEFINE(HAVE_LIBINTL, 1)
@@ -203,18 +201,20 @@ dnl --------------------------------------------------------------------------- @@ -203,18 +201,20 @@ dnl ---------------------------------------------------------------------------
203 dnl Check for GTK 201 dnl Check for GTK
204 dnl --------------------------------------------------------------------------- 202 dnl ---------------------------------------------------------------------------
205 203
206 -PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.] ) 204 +PKG_CHECK_MODULES( [GTK], [gtk+-3.0 gmodule-2.0], AC_DEFINE(HAVE_GTK), AC_MSG_ERROR([GTK not present.]))
207 205
208 AC_SUBST(GTK_LIBS) 206 AC_SUBST(GTK_LIBS)
209 AC_SUBST(GTK_CFLAGS) 207 AC_SUBST(GTK_CFLAGS)
210 AC_SUBST(GTK_VERSION) 208 AC_SUBST(GTK_VERSION)
211 AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`) 209 AC_SUBST(GTK_MODVERSION,`$PKG_CONFIG --modversion gtk+-$GTK_VERSION`)
212 210
  211 +
  212 +
213 dnl --------------------------------------------------------------------------- 213 dnl ---------------------------------------------------------------------------
214 dnl Check for GLIB 214 dnl Check for GLIB
215 dnl --------------------------------------------------------------------------- 215 dnl ---------------------------------------------------------------------------
216 216
217 -PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB), AC_MSG_ERROR([GLIB not present.] ) 217 +PKG_CHECK_MODULES( [GLIB], [glib-2.0], AC_DEFINE(HAVE_GLIB), AC_MSG_ERROR([GLIB not present.] ))
218 AC_SUBST(GLIB_LIBS) 218 AC_SUBST(GLIB_LIBS)
219 AC_SUBST(GLIB_CFLAGS) 219 AC_SUBST(GLIB_CFLAGS)
220 220
src/include/config.h.in 0 → 100644
  Diff comments   View file @5f00f1c
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
  1 +/*
  2 + * "Software G3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
  3 + * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
  4 + * aplicativos mainframe. Registro no INPI sob o nome G3270.
  5 + *
  6 + * Copyright (C) <2008> <Banco do Brasil S.A.>
  7 + *
  8 + * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
  9 + * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
  10 + * Free Software Foundation.
  11 + *
  12 + * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
  13 + * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
  14 + * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
  15 + * obter mais detalhes.
  16 + *
  17 + * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
  18 + * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
  19 + * St, Fifth Floor, Boston, MA 02110-1301 USA
  20 + *
  21 + * Este programa está nomeado como config.h e possui - linhas de código.
  22 + *
  23 + * Contatos:
  24 + *
  25 + * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
  26 + * erico.mendonca@gmail.com (Erico Mascarenhas de Mendonça)
  27 + *
  28 + */
  29 +
  30 +#ifndef LIBV3270_CONFIG_INCLUDED
  31 +
  32 + #define LIBV3270_CONFIG_INCLUDED 1
  33 +
  34 + #undef PACKAGE_NAME
  35 + #undef PACKAGE_VERSION
  36 + #undef PACKAGE_RELEASE
  37 +
  38 + #undef HAVE_GNUC_VISIBILITY
  39 +
  40 + #undef HAVE_GNOME
  41 + #undef HAVE_GTKMAC
  42 +
  43 +#endif /* LIBV3270_CONFIG_INCLUDED */
src/v3270/marshal 0 → 100644
  Diff comments   View file @5f00f1c
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
  1 +VOID:VOID
  2 +VOID:VOID,ENUM,BOOLEAN,POINTER
  3 +VOID:VOID,ENUM
  4 +VOID:VOID,POINTER
  5 +VOID:POINTER
  6 +VOID:VOID,POINTER,POINTER
  7 +VOID:VOID,UINT,POINTER
  8 +BOOLEAN:VOID,UINT,ENUM
  9 +VOID:VOID,BOOLEAN
  10 +BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER
  11 +VOID:VOID,UINT,UINT
  12 +VOID:VOID,UINT,POINTER,POINTER,POINTER
  13 +BOOLEAN:VOID,BOOLEAN,UINT,POINTER
src/v3270/v3270.marshal
View file @d822eaa
@@ -1,13 +0,0 @@ @@ -1,13 +0,0 @@
1 -VOID:VOID  
2 -VOID:VOID,ENUM,BOOLEAN,POINTER  
3 -VOID:VOID,ENUM  
4 -VOID:VOID,POINTER  
5 -VOID:POINTER  
6 -VOID:VOID,POINTER,POINTER  
7 -VOID:VOID,UINT,POINTER  
8 -BOOLEAN:VOID,UINT,ENUM  
9 -VOID:VOID,BOOLEAN  
10 -BOOLEAN:VOID,BOOLEAN,BOOLEAN,POINTER  
11 -VOID:VOID,UINT,UINT  
12 -VOID:VOID,UINT,POINTER,POINTER,POINTER  
13 -BOOLEAN:VOID,BOOLEAN,UINT,POINTER  
src/v3270ft/marshal 0 → 100644
  Diff comments   View file @5f00f1c
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +VOID:POINTER,POINTER
src/v3270ft/v3270ft.marshal
View file @d822eaa
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -VOID:POINTER,POINTER