Download as
Browse Code »

Commit 971fa093e54e598d9fa8524d01955dff642ff198

Authored by Perry Werneck
1 parent 712685f7
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Separando libv3270 e ajustando processo de compilação para usá-la 

(provisóriamente) como um sub-módulo.
Showing 7 changed files with 47 additions and 15 deletions   Show diff stats
1 [submodule "modules/lib3270"] 1 [submodule "modules/lib3270"]
2 path = modules/lib3270 2 path = modules/lib3270
3 url = https://github.com/PerryWerneck/lib3270.git 3 url = https://github.com/PerryWerneck/lib3270.git
  4 +[submodule "modules/libv3270"]
  5 + path = modules/libv3270
  6 + url = http://softwarepublico.gov.br/gitlab/pw3270/libv3270.git
@@ -81,10 +81,11 @@ Release: \ @@ -81,10 +81,11 @@ Release: \
81 81
82 #---[ Debug Rules ]---------------------------------------------------------------------- 82 #---[ Debug Rules ]----------------------------------------------------------------------
83 83
84 -$(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \ 84 +$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
85 modules/lib3270/* \ 85 modules/lib3270/* \
86 modules/lib3270/src/lib3270/* \ 86 modules/lib3270/src/lib3270/* \
87 - modules/lib3270/src/include/* 87 + modules/lib3270/src/include/* \
  88 + modules/lib3270/src/include/lib3270/*
88 89
89 @$(MKDIR) `dirname $@` 90 @$(MKDIR) `dirname $@`
90 @$(MAKE) -C modules/lib3270 Debug 91 @$(MAKE) -C modules/lib3270 Debug
@@ -92,8 +93,21 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \ @@ -92,8 +93,21 @@ $(BINDBG)/@DLLPREFIX@3270@DLLEXT@: \
92 @$(MKDIR) $(BINDBG) 93 @$(MKDIR) $(BINDBG)
93 @cp ./modules/lib3270/.bin/Debug/* $(BINDBG) 94 @cp ./modules/lib3270/.bin/Debug/* $(BINDBG)
94 95
  96 +$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
  97 + modules/libv3270/* \
  98 + modules/libv3270/src/v3270/* \
  99 + modules/libv3270/src/include/* \
  100 + modules/libv3270/src/include/v3270/* \
  101 +
  102 + @$(MKDIR) `dirname $@`
  103 + @$(MAKE) -C modules/libv3270 Debug
  104 +
  105 + @$(MKDIR) $(BINDBG)
  106 + @cp ./modules/libv3270/.bin/Debug/* $(BINDBG)
  107 +
95 $(BINDBG)/%@EXEEXT@: \ 108 $(BINDBG)/%@EXEEXT@: \
96 - $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \ 109 + $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \
  110 + $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \
97 src/% \ 111 src/% \
98 src/%/* 112 src/%/*
99 113
@@ -140,6 +154,7 @@ $(DESTDIR)/$(libdir)/pw3270-plugins/%@DLLEXT@: \ @@ -140,6 +154,7 @@ $(DESTDIR)/$(libdir)/pw3270-plugins/%@DLLEXT@: \
140 install: \ 154 install: \
141 locale/$(PACKAGE_TARNAME).pot \ 155 locale/$(PACKAGE_TARNAME).pot \
142 install-lib3270 \ 156 install-lib3270 \
  157 + install-libv3270 \
143 install-pw3270 \ 158 install-pw3270 \
144 install-branding \ 159 install-branding \
145 install-ui \ 160 install-ui \
@@ -252,6 +267,7 @@ cleanDebug: @@ -252,6 +267,7 @@ cleanDebug:
252 @rm -fr $(OBJDBG) 267 @rm -fr $(OBJDBG)
253 @rm -fr $(BINDBG) 268 @rm -fr $(BINDBG)
254 @$(MAKE) -C modules/lib3270 $@ 269 @$(MAKE) -C modules/lib3270 $@
  270 + @$(MAKE) -C modules/libv3270 $@
255 @$(MAKE) -C src/pw3270 $@ 271 @$(MAKE) -C src/pw3270 $@
256 272
257 cleanRelease: 273 cleanRelease:
@@ -259,6 +275,7 @@ cleanRelease: @@ -259,6 +275,7 @@ cleanRelease:
259 @rm -fr $(OBJRLS) 275 @rm -fr $(OBJRLS)
260 @rm -fr $(BINRLS) 276 @rm -fr $(BINRLS)
261 @$(MAKE) -C modules/lib3270 $@ 277 @$(MAKE) -C modules/lib3270 $@
  278 + @$(MAKE) -C modules/libv3270 $@
262 @$(MAKE) -C src/pw3270 $@ 279 @$(MAKE) -C src/pw3270 $@
263 280
264 281
@@ -56,6 +56,7 @@ if test $? != 0 ; then @@ -56,6 +56,7 @@ if test $? != 0 ; then
56 fi 56 fi
57 57
58 NOCONFIGURE=1 ./modules/lib3270/autogen.sh 58 NOCONFIGURE=1 ./modules/lib3270/autogen.sh
  59 +NOCONFIGURE=1 ./modules/libv3270/autogen.sh
59 60
60 echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE" 61 echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE"
61 62
@@ -39,6 +39,7 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com]) @@ -39,6 +39,7 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com])
39 dnl Place auxilliary scripts here. 39 dnl Place auxilliary scripts here.
40 AC_CONFIG_AUX_DIR([scripts]) 40 AC_CONFIG_AUX_DIR([scripts])
41 AC_CONFIG_SUBDIRS([modules/lib3270]) 41 AC_CONFIG_SUBDIRS([modules/lib3270])
  42 +AC_CONFIG_SUBDIRS([modules/libv3270])
42 43
43 dnl Compute the canonical host-system type 44 dnl Compute the canonical host-system type
44 AC_CANONICAL_HOST 45 AC_CANONICAL_HOST
@@ -401,11 +402,15 @@ dnl --------------------------------------------------------------------------- @@ -401,11 +402,15 @@ dnl ---------------------------------------------------------------------------
401 402
402 AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ]) 403 AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
403 404
404 -AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include/lib3270) 405 +AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)
  406 +AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include)
405 407
406 AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include) 408 AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)
407 AC_SUBST(LIB3270_LIBS,-l$app_cv_libname) 409 AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)
408 410
  411 +AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)
  412 +AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname)
  413 +
409 AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include) 414 AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)
410 415
411 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) 416 AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
modules/lib3270
  Diff comments   View file @971fa09
1 -Subproject commit 83a5155f08d7c7a6b20d717f733ea88d26411b29 1 +Subproject commit 7ee2d8ee2d5343d0879f4a2b11862502ed967ca5
modules/libv3270 0 → 160000
  Diff comments   View file @971fa09
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +Subproject commit 64bfb1a610ab503c915cca28b791a5fdfefc5774
src/pw3270/Makefile.in
  Diff comments   View file @971fa09
@@ -31,7 +31,7 @@ LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \ @@ -31,7 +31,7 @@ LIB_SOURCES=window.c actions.c fonts.c dialog.c hostdialog.c print.c colors.c \
31 31
32 APP_SOURCES=main.c @APP_RESOURCES@ 32 APP_SOURCES=main.c @APP_RESOURCES@
33 33
34 -MODULES=v3270 uiparser v3270ft common 34 +MODULES=uiparser common
35 35
36 #---[ Configuration values ]------------------------------------------------------------- 36 #---[ Configuration values ]-------------------------------------------------------------
37 37
@@ -76,15 +76,23 @@ MSGCAT=@MSGCAT@ @@ -76,15 +76,23 @@ MSGCAT=@MSGCAT@
76 CONVERT=@CONVERT@ 76 CONVERT=@CONVERT@
77 WINDRES=@WINDRES@ 77 WINDRES=@WINDRES@
78 78
79 -CFLAGS=@CFLAGS@ \ 79 +CFLAGS= \
  80 + @CFLAGS@ \
80 @LIB3270_CFLAGS@ \ 81 @LIB3270_CFLAGS@ \
81 @PW3270_CFLAGS@ \ 82 @PW3270_CFLAGS@ \
82 -Wno-deprecated-declarations \ 83 -Wno-deprecated-declarations \
83 - @LIBSSL_CFLAGS@ @GTK_CFLAGS@ \ 84 + @LIBSSL_CFLAGS@ \
  85 + @GTK_CFLAGS@ \
84 -DLIBDIR=\"$(libdir)\" \ 86 -DLIBDIR=\"$(libdir)\" \
85 -DDATAROOTDIR=\"$(datarootdir)\" 87 -DDATAROOTDIR=\"$(datarootdir)\"
86 88
87 -LIBS=@LIBS@ @LIBSSL_LIBS@ @GTK_LIBS@ @LIB3270_LIBS@ 89 +LIBS= \
  90 + @LIBS@ \
  91 + @LIBSSL_LIBS@ \
  92 + @GTK_LIBS@ \
  93 + @LIB3270_LIBS@ \
  94 + @LIBV3270_LIBS@
  95 +
88 LDFLAGS=@LDFLAGS@ 96 LDFLAGS=@LDFLAGS@
89 APP_LDFLAGS=@APP_LDFLAGS@ 97 APP_LDFLAGS=@APP_LDFLAGS@
90 98
@@ -93,8 +101,9 @@ APP_LDFLAGS=@APP_LDFLAGS@ @@ -93,8 +101,9 @@ APP_LDFLAGS=@APP_LDFLAGS@
93 DEPENDS=\ 101 DEPENDS=\
94 $(BASEDIR)/src/include/*.h \ 102 $(BASEDIR)/src/include/*.h \
95 @LIB3270_INCLUDEPATH@/*.h \ 103 @LIB3270_INCLUDEPATH@/*.h \
96 - $(BASEDIR)/src/include/pw3270/*.h \  
97 - $(BASEDIR)/src/include/v3270/*.h \ 104 + @LIB3270_INCLUDEPATH@/lib3270/*.h \
  105 + @LIBV3270_INCLUDEPATH@/*.h \
  106 + @LIB3270_INCLUDEPATH@/v3270/*.h \
98 *.h \ 107 *.h \
99 Makefile 108 Makefile
100 109
@@ -339,8 +348,6 @@ cleanDebug: @@ -339,8 +348,6 @@ cleanDebug:
339 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ 348 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
340 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ 349 $(BINDBG)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
341 350
342 - @make -C v3270 cleanDebug  
343 - @make -C v3270ft cleanDebug  
344 @make -C uiparser cleanDebug 351 @make -C uiparser cleanDebug
345 @make -C common cleanDebug 352 @make -C common cleanDebug
346 353
@@ -351,8 +358,6 @@ cleanRelease: @@ -351,8 +358,6 @@ cleanRelease:
351 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \ 358 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@ \
352 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@ 359 $(BINRLS)/$(LIBNAME).@PACKAGE_MAJOR_VERSION@.@PACKAGE_MINOR_VERSION@
353 360
354 - @make -C v3270 cleanRelease  
355 - @make -C v3270ft cleanRelease  
356 @make -C uiparser cleanRelease 361 @make -C uiparser cleanRelease
357 @make -C common cleanRelease 362 @make -C common cleanRelease
358 363