move vgsuppression to tests/tool, it will only needed for running tests

This commit is contained in:
Christian Thaeter 2009-01-15 01:34:01 +01:00
parent 9665aa1df9
commit 4172bdf17f
6 changed files with 39 additions and 8 deletions

View file

@ -64,6 +64,7 @@ include $(top_srcdir)/icons/Makefile.am
include $(top_srcdir)/tests/lib/Makefile.am
include $(top_srcdir)/tests/components/Makefile.am
include $(top_srcdir)/tests/Makefile.am
include $(top_srcdir)/tests/tool/Makefile.am
#EXTRA_DIST += admin debian doc depcomp README.BUILD LICENSE \
# cinelerra-cvs-current.spec

View file

@ -24,12 +24,6 @@ luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumiera
luidgen_SOURCES = $(lumitool_srcdir)/luidgen.c
noinst_PROGRAMS += vgsuppression
vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl
vgsuppression_SOURCES = $(lumitool_srcdir)/vgsuppression.c
noinst_PROGRAMS += rsvg-convert
rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -std=gnu99 -Wall -Werror
rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2

View file

@ -7,7 +7,6 @@ Import('env','envGtk','artifacts','core')
support_lib = artifacts['support']
vgsuppr = env.Program('#$BINDIR/vgsuppression','vgsuppression.c', LIBS=core) ## for suppressing false valgrind alarms
luidgen = env.Program('#$BINDIR/luidgen', 'luidgen.c', LIBS=support_lib) ## for rendering SVG icons (uses librsvg)
rsvg = envGtk.Program('#$BINDIR/rsvg-convert','rsvg-convert.c')
@ -17,7 +16,6 @@ rsvg = envGtk.Program('#$BINDIR/rsvg-convert','rsvg-convert.c')
artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c') #### hello world (checks C build)
+ env.Program('#$BINDIR/try', 'try.cpp') #### to try out some feature...
+ luidgen
+ vgsuppr
+ rsvg
]

24
tests/tool/Makefile.am Normal file
View file

@ -0,0 +1,24 @@
# Copyright (C) Lumiera.org
# 2008 Christian Thaeter <ct@pipapo.org>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
# published by the Free Software Foundation; either version 2 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
lumitesttool_srcdir = $(top_srcdir)/tests/tool
noinst_PROGRAMS += vgsuppression
vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl
vgsuppression_SOURCES = $(lumitesttool_srcdir)/vgsuppression.c

14
tests/tool/SConscript Normal file
View file

@ -0,0 +1,14 @@
# -*- python -*-
##
## SConscript - SCons buildscript for tool subdirectory (called by SConstruct)
##
Import('env','envGtk','artifacts','core')
support_lib = artifacts['support']
vgsuppr = env.Program('#$BINDIR/vgsuppression','vgsuppression.c', LIBS=core) ## for suppressing false valgrind alarms
# build additional test
artifacts['tools'] = [vgsuppr]