[geany/geany-plugins] b93423: Waf: Fix build by not compiling unittests.c in normal build

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Wed, 11 Mar 2015 22:36:40 UTC
Commit:      b93423d4d6ebe49500b52b5119b2022755eaabc5
             https://github.com/geany/geany-plugins/commit/b93423d4d6ebe49500b52b5119b2022755eaabc5

Log Message:
-----------
Waf: Fix build by not compiling unittests.c in normal build

The convenient way of just using all *.c files for compilation doesn't
work anymore here. So specify source files explicitly as it is done
in src/Makefile.am.


Modified Paths:
--------------
    geanyprj/wscript_build
    geanyvc/wscript_build

Modified: geanyprj/wscript_build
11 lines changed, 9 insertions(+), 2 deletions(-)
===================================================================
@@ -24,6 +24,13 @@ from build.wafutils import build_plugin
 
 
 name = 'GeanyPrj'
-includes = ['geanyprj/src']
+#~includes = ['geanyprj/src']
+sources = [
+    'src/menu.c',
+    'src/project.c',
+    'src/sidebar.c',
+    'src/utils.c',
+    'src/xproject.c'
+]
 
-build_plugin(bld, name, includes=includes)
+build_plugin(bld, name, sources=sources)


Modified: geanyvc/wscript_build
14 lines changed, 12 insertions(+), 2 deletions(-)
===================================================================
@@ -24,7 +24,17 @@ from build.wafutils import build_plugin
 
 
 name = 'GeanyVC'
-includes = ['geanyvc/src']
 libraries = ['GTKSPELL']
+sources = [
+    'src/externdiff.c',
+    'src/geanyvc.c',
+    'src/utils.c',
+    'src/vc_bzr.c',
+    'src/vc_cvs.c',
+    'src/vc_git.c',
+    'src/vc_hg.c',
+    'src/vc_svk.c',
+    'src/vc_svn.c'
+]
 
-build_plugin(bld, name, includes=includes, libraries=libraries)
+build_plugin(bld, name, sources=sources, libraries=libraries)



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).