Branch: refs/heads/master Author: Steven Blatnick <steve8track(at)yahoo.com> Committer: Steven Blatnick <steve8track(at)yahoo.com> Date: Thu, 20 Dec 2012 00:14:02 UTC Commit: bfb932c6019942ab0440d18e7a1cece9c49052ad https://github.com/geany/geany-plugins/commit/bfb932c6019942ab0440d18e7a1cec...
Log Message: ----------- Merge branch 'master' of github.com:geany/geany-plugins
Modified Paths: -------------- build/scope.m4 scope/ChangeLog scope/TODO scope/src/Makefile.am scope/wscript_build
Modified: build/scope.m4 7 files changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,13 @@ AC_DEFUN([GP_CHECK_SCOPE],
GP_STATUS_PLUGIN_ADD([Scope], [$enable_scope])
+ case "$host_os" in + cygwin* | mingw* | win32*) PTY_LIBS="" ;; + *) PTY_LIBS="-lutil" ;; + esac + + AC_SUBST(PTY_LIBS) + AC_CONFIG_FILES([ scope/Makefile scope/data/Makefile
Modified: scope/ChangeLog 5 files changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,8 @@ +2012-12-18 Dimitar Zhekov dimitar.zhekov@gmail.com + + * build/scope.m4, scope/src/Makefile.am: + No -lutil under win32. + 2012-12-16 Dimitar Zhekov dimitar.zhekov@gmail.com
* src/common.h, src/menu.h:
Modified: scope/TODO 2 files changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -1,5 +1,3 @@ -wscript_* - various tests, source code checks etc.
ask user for terminate debugging on build actions
Modified: scope/src/Makefile.am 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -44,7 +44,7 @@ scope_la_SOURCES = \ watch.c \ watch.h
-scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) -lutil +scope_la_LIBADD = $(COMMONLIBS) $(VTE_LIBS) $(PTY_LIBS)
scope_la_CFLAGS = $(AM_CFLAGS) $(VTE_CFLAGS) \ -DPLUGINDATADIR="$(plugindatadir)" \
Modified: scope/wscript_build 12 files changed, 8 insertions(+), 4 deletions(-) =================================================================== @@ -25,13 +25,17 @@ from build.wafutils import build_plugin, target_is_win32
name = 'Scope' includes = ['scope/src'] -if not target_is_win32(bld) : + +if target_is_win32(bld): + datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' + docdir = '${G_PREFIX}/doc/plugins/scope' +else: + datadir = '${GEANYPLUGINS_DATADIR}' + docdir = '${DOCDIR}/scope' libraries = ['VTE', 'UTIL']
-datadir = '${G_PREFIX}/${GEANYPLUGINS_DATADIR}' if is_win32 else '${GEANYPLUGINS_DATADIR}' -docdir = '${G_PREFIX}/doc/plugins/scope' if is_win32 else '${DOCDIR}/scope' htmldocdir = '%s/html' % docdir -defines=[ 'PLUGINDATADIR="' + datadir + '"', 'PLUGINHTMLDOCDIR="' + htmldocdir + '"'] +defines = [ 'PLUGINDATADIR="' + datadir + '"', 'PLUGINHTMLDOCDIR="' + htmldocdir + '"']
build_plugin(bld, name, includes=includes, libraries=libraries, defines=defines)
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).