Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Wed, 28 Mar 2012 04:26:18 Commit: 6ab37627bca2116df04dd5a827462a3184d08ba5 https://github.com/geany/geany-plugins/commit/6ab37627bca2116df04dd5a827462a...

Log Message: ----------- devhelp: Remove glob and list all source files in wscript_build

Fixes files missing from compilation and causing undefined symbols.

Modified Paths: -------------- devhelp/wscript_build devhelp/wscript_configure

Modified: devhelp/wscript_build 28 files changed, 22 insertions(+), 6 deletions(-) =================================================================== @@ -23,14 +23,30 @@

from build.wafutils import build_plugin

-import glob - name = 'Devhelp' includes = [ '../devhelp', 'devhelp/src', 'devhelp/devhelp' ] libraries = [ 'GTK', 'GTHREAD', 'WEBKIT', 'LIBWNCK', 'GCONF2', 'ZLIB' ] -sources = [ 'src/dhp-manpages.c', - 'src/dhp-object.c', - 'src/dhp-plugin.c' ] -sources += glob.glob('devhelp/*.c') +sources = [ "devhelp/dh-assistant.c", + "devhelp/dh-assistant-view.c", + "devhelp/dh-base.c", + "devhelp/dh-book.c", + "devhelp/dh-book-manager.c", + "devhelp/dh-book-tree.c", + "devhelp/dh-enum-types.c", + "devhelp/dh-error.c", + "devhelp/dh-keyword-model.c", + "devhelp/dh-link.c", + "devhelp/dh-marshal.c", + "devhelp/dh-parser.c", + "devhelp/dh-preferences.c", + "devhelp/dh-search.c", + "devhelp/dh-util.c", + "devhelp/dh-window.c", + "devhelp/eggfindbar.c", + "devhelp/ige-conf.c", + "devhelp/ige-conf-gconf.c", + "src/dhp-manpages.c", + "src/dhp-object.c", + "src/dhp-plugin.c" ]

build_plugin(bld, name, sources=sources, includes=includes, libraries=libraries)

Modified: devhelp/wscript_configure 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -42,3 +42,4 @@ for package_name, package_version, uselib_store in packages: args='--cflags --libs')

add_to_env_and_define(conf, 'HAVE_BOOK_MANAGER', 1) +add_to_env_and_define(conf, 'PACKAGE_VERSION', 1)

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).