Download as
Browse Code »

Commit 746200bfd214debc9e6444c498c3a4d09341f9e5

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

Disabling build of modules.

Showing 2 changed files with 48 additions and 39 deletions   Show diff stats
@@ -32,6 +32,7 @@ PACKAGE_LEVEL=@PACKAGE_LEVEL@ @@ -32,6 +32,7 @@ PACKAGE_LEVEL=@PACKAGE_LEVEL@
32 PACKAGE_TARNAME=@PACKAGE_TARNAME@ 32 PACKAGE_TARNAME=@PACKAGE_TARNAME@
33 PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@ 33 PACKAGE_DESCRIPTION=@PACKAGE_DESCRIPTION@
34 PLUGINS=@PLUGINS@ 34 PLUGINS=@PLUGINS@
  35 +# MODULES=3270
35 36
36 #---[ Paths ]------------------------------------------------------------------ 37 #---[ Paths ]------------------------------------------------------------------
37 38
@@ -81,27 +82,26 @@ Release: \ @@ -81,27 +82,26 @@ Release: \
81 82
82 #---[ Debug Rules ]---------------------------------------------------------------------- 83 #---[ Debug Rules ]----------------------------------------------------------------------
83 84
84 -$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \  
85 - modules/lib3270/* \  
86 - modules/lib3270/src/lib3270/* \  
87 - modules/lib3270/src/include/* \  
88 - modules/lib3270/src/include/lib3270/*  
89 -  
90 - @$(MKDIR) `dirname $@`  
91 - @$(MAKE) -C modules/lib3270 $@  
92 -  
93 -$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \  
94 - modules/libv3270/* \  
95 - modules/libv3270/src/v3270/* \  
96 - modules/libv3270/src/include/* \  
97 - modules/libv3270/src/include/v3270/* \  
98 -  
99 - @$(MKDIR) `dirname $@`  
100 - @$(MAKE) -C modules/libv3270 $@ 85 +#$(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@: \
  86 +# modules/lib3270/* \
  87 +# modules/lib3270/src/lib3270/* \
  88 +# modules/lib3270/src/include/* \
  89 +# modules/lib3270/src/include/lib3270/*
  90 +#
  91 +# @$(MKDIR) `dirname $@`
  92 +# @$(MAKE) -C modules/lib3270 $@
  93 +
  94 +#$(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@: \
  95 +# modules/libv3270/* \
  96 +# modules/libv3270/src/v3270/* \
  97 +# modules/libv3270/src/include/* \
  98 +# modules/libv3270/src/include/v3270/* \
  99 +#
  100 +# @$(MKDIR) `dirname $@`
  101 +# @$(MAKE) -C modules/libv3270 $@
101 102
102 $(BINDBG)/%@EXEEXT@: \ 103 $(BINDBG)/%@EXEEXT@: \
103 - $(BINDBG)/@DLLPREFIX@@LIB3270_NAME@@DLLEXT@ \  
104 - $(BINDBG)/@DLLPREFIX@v@LIB3270_NAME@@DLLEXT@ \ 104 + $(foreach MODULE, $(MODULES), $(BINDBG)/@DLLPREFIX@$(MODULE)@DLLEXT@) \
105 src/% \ 105 src/% \
106 src/%/* 106 src/%/*
107 107
@@ -230,12 +230,10 @@ $(POTDIR)/%.pot: \ @@ -230,12 +230,10 @@ $(POTDIR)/%.pot: \
230 #---[ Debug Targets ]-------------------------------------------------------------------- 230 #---[ Debug Targets ]--------------------------------------------------------------------
231 231
232 Debug: \ 232 Debug: \
233 - $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \  
234 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \ 233 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ \
235 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@) 234 $(foreach PLG, $(PLUGINS), $(BINDBG)/plugins/$(PLG)@DLLEXT@)
236 235
237 run: \ 236 run: \
238 - $(BINDBG)/@DLLPREFIX@3270@DLLEXT@ \  
239 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 237 $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
240 238
241 @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@ 239 @LD_LIBRARY_PATH=$(BINDBG) $(BINDBG)/$(PACKAGE_TARNAME)@EXEEXT@
@@ -269,16 +267,12 @@ cleanDebug: @@ -269,16 +267,12 @@ cleanDebug:
269 267
270 @rm -fr $(OBJDBG) 268 @rm -fr $(OBJDBG)
271 @rm -fr $(BINDBG) 269 @rm -fr $(BINDBG)
272 - @$(MAKE) -C modules/lib3270 $@  
273 - @$(MAKE) -C modules/libv3270 $@  
274 @$(MAKE) -C src/pw3270 $@ 270 @$(MAKE) -C src/pw3270 $@
275 271
276 cleanRelease: 272 cleanRelease:
277 273
278 @rm -fr $(OBJRLS) 274 @rm -fr $(OBJRLS)
279 @rm -fr $(BINRLS) 275 @rm -fr $(BINRLS)
280 - @$(MAKE) -C modules/lib3270 $@  
281 - @$(MAKE) -C modules/libv3270 $@  
282 @$(MAKE) -C src/pw3270 $@ 276 @$(MAKE) -C src/pw3270 $@
283 277
284 278
@@ -398,26 +398,41 @@ dnl --------------------------------------------------------------------------- @@ -398,26 +398,41 @@ dnl ---------------------------------------------------------------------------
398 dnl Lib3270 flags 398 dnl Lib3270 flags
399 dnl --------------------------------------------------------------------------- 399 dnl ---------------------------------------------------------------------------
400 400
401 -AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ]) 401 +dnl AC_ARG_WITH([libname], [AS_HELP_STRING([--with-libname], [Setup library name])], [ app_cv_libname="$withval" ],[ app_cv_libname="3270" ])
402 402
403 -AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)  
404 -AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include) 403 +PKG_CHECK_MODULES( [LIB3270], [lib3270], app_cv_3270="yes", app_cv_3270="no" )
405 404
406 -AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)  
407 -AC_SUBST(LIB3270_LIBS,-l$app_cv_libname) 405 +if test "$app_cv_3270" == "yes"; then
  406 + AC_DEFINE(HAVE_LIB3270)
  407 + AC_SUBST(LIB3270_CFLAGS)
  408 + AC_SUBST(LIB3270_LIBS)
  409 +else
  410 + AC_MSG_ERROR([ No LIB3270 devel.])
  411 +dnl AX_SUBDIRS_CONFIGURE([modules/lib3270],[[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
  412 +dnl AC_SUBST(LIB3270_CFLAGS,-I$ac_pwd/modules/lib3270/src/include)
  413 +dnl AC_SUBST(LIB3270_LIBS,-l$app_cv_libname)
  414 +dnl AC_SUBST(LIB3270_INCLUDEPATH,$ac_pwd/modules/lib3270/src/include)
  415 +fi
408 416
409 -AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)  
410 -AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname) 417 +PKG_CHECK_MODULES( [LIBV3270], [libv3270], app_cv_v3270="yes", app_cv_v3270="no" )
411 418
412 -AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)  
413 -  
414 -AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME) 419 +if test "$app_cv_v3270" == "yes"; then
  420 + AC_DEFINE(HAVE_LIBV3270)
  421 + AC_SUBST(LIBV3270_CFLAGS)
  422 + AC_SUBST(LIBV3270_LIBS)
  423 +else
  424 + AC_MSG_ERROR([ No V3270 widget devel.])
  425 +dnl AC_SUBST(LIBV3270_CFLAGS,-I$ac_pwd/modules/libv3270/src/include)
  426 +dnl AC_SUBST(LIBV3270_LIBS,-lv$app_cv_libname)
  427 +dnl AX_SUBDIRS_CONFIGURE([modules/libv3270],[[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],[LIB3270_LIBS=-l$app_cv_libname],[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])
  428 +dnl AC_SUBST(LIBV3270_INCLUDEPATH,$ac_pwd/modules/libv3270/src/include)
  429 +fi
415 430
416 -AC_DEFINE(LIB3270_NAME,$app_cv_libname)  
417 -AC_SUBST(LIB3270_NAME,$app_cv_libname) 431 +dnl AC_DEFINE(LIB3270_NAME,$app_cv_libname)
  432 +dnl AC_SUBST(LIB3270_NAME,$app_cv_libname)
418 433
419 -AX_SUBDIRS_CONFIGURE([modules/lib3270],[[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]])  
420 -AX_SUBDIRS_CONFIGURE([modules/libv3270],[[LIB3270_CFLAGS=-I$ac_pwd/modules/lib3270/src/include],[LIB3270_LIBS=-l$app_cv_libname],[--with-work-dir=$ac_pwd],[--with-libname=$app_cv_libname]]) 434 +AC_SUBST(PW3270_CFLAGS,-I$ac_pwd/src/include)
  435 +AC_SUBST(PW3270_LIBS,-l$PACKAGE_TARNAME)
421 436
422 dnl --------------------------------------------------------------------------- 437 dnl ---------------------------------------------------------------------------
423 dnl Check for headers 438 dnl Check for headers