Download as
Browse Code »

Commit 49b54cd919c655b12eda73402aa968c77286ba9b

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

Compilando widget gtk como submódulo.

Showing 5 changed files with 15 additions and 14 deletions   Show diff stats
@@ -90,9 +90,6 @@ $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \ @@ -90,9 +90,6 @@ $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
90 @$(MKDIR) `dirname $@` 90 @$(MKDIR) `dirname $@`
91 @$(MAKE) -C modules/lib3270 Debug 91 @$(MAKE) -C modules/lib3270 Debug
92 92
93 - @$(MKDIR) $(BINDBG)  
94 - @cp ./modules/lib3270/.bin/Debug/* $(BINDBG)  
95 -  
96 $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \ 93 $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
97 modules/libv3270/* \ 94 modules/libv3270/* \
98 modules/libv3270/src/v3270/* \ 95 modules/libv3270/src/v3270/* \
@@ -102,9 +99,6 @@ $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \ @@ -102,9 +99,6 @@ $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
102 @$(MKDIR) `dirname $@` 99 @$(MKDIR) `dirname $@`
103 @$(MAKE) -C modules/libv3270 Debug 100 @$(MAKE) -C modules/libv3270 Debug
104 101
105 - @$(MKDIR) $(BINDBG)  
106 - @cp ./modules/libv3270/.bin/Debug/* $(BINDBG)  
107 -  
108 $(BINDBG)/%@EXEEXT@: \ 102 $(BINDBG)/%@EXEEXT@: \
109 $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \ 103 $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \
110 $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \ 104 $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \
@@ -38,8 +38,6 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com]) @@ -38,8 +38,6 @@ AC_INIT([pw3270], [5.2], [perry.werneck@gmail.com])
38 38
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])  
42 -AC_CONFIG_SUBDIRS([modules/libv3270])  
43 41
44 dnl Compute the canonical host-system type 42 dnl Compute the canonical host-system type
45 AC_CANONICAL_HOST 43 AC_CANONICAL_HOST
@@ -418,6 +416,19 @@ AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) @@ -418,6 +416,19 @@ AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
418 AC_DEFINE(LIB3270_NAME,$app_cv_libname) 416 AC_DEFINE(LIB3270_NAME,$app_cv_libname)
419 AC_SUBST(LIB3270_NAME,$app_cv_libname) 417 AC_SUBST(LIB3270_NAME,$app_cv_libname)
420 418
  419 +AX_SUBDIRS_CONFIGURE(
  420 + [modules/lib3270],
  421 + [--with-work-dir=$ac_pwd],
  422 + [--with-libname=$app_cv_libname]
  423 +)
  424 +
  425 +AX_SUBDIRS_CONFIGURE(
  426 + [modules/libv3270],
  427 + [LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],
  428 + [LIB3270_LIBS=-l$app_cv_libname],
  429 + [--with-work-dir=$ac_pwd]
  430 +)
  431 +
421 dnl --------------------------------------------------------------------------- 432 dnl ---------------------------------------------------------------------------
422 dnl Check for headers 433 dnl Check for headers
423 dnl --------------------------------------------------------------------------- 434 dnl ---------------------------------------------------------------------------
modules/lib3270
  Diff comments   View file @49b54cd
1 -Subproject commit 7ee2d8ee2d5343d0879f4a2b11862502ed967ca5 1 +Subproject commit fe3154fe8908b53ec477dfe873243274b3fc9e2f
modules/libv3270
  Diff comments   View file @49b54cd
1 -Subproject commit 64bfb1a610ab503c915cca28b791a5fdfefc5774 1 +Subproject commit 40e11ff247691dd2742c2e3112e1a87b0b77d69d
src/pw3270/Makefile.in
  Diff comments   View file @49b54cd
@@ -100,10 +100,6 @@ APP_LDFLAGS=@APP_LDFLAGS@ @@ -100,10 +100,6 @@ APP_LDFLAGS=@APP_LDFLAGS@
100 100
101 DEPENDS=\ 101 DEPENDS=\
102 $(BASEDIR)/src/include/*.h \ 102 $(BASEDIR)/src/include/*.h \
103 - @LIB3270_INCLUDEPATH@/*.h \  
104 - @LIB3270_INCLUDEPATH@/lib3270/*.h \  
105 - @LIBV3270_INCLUDEPATH@/*.h \  
106 - @LIB3270_INCLUDEPATH@/v3270/*.h \  
107 *.h \ 103 *.h \
108 Makefile 104 Makefile
109 105