From bdffc18101417c127867fe9794daae6bff4921b3 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Tue, 13 Jan 2009 12:16:48 +0100 Subject: [PATCH] move all tools to src/tool and remove admin dir from build --- Makefile.am | 3 --- SConstruct | 17 ++++++++--------- admin/Makefile.am | 28 ---------------------------- admin/SConscript | 17 ----------------- src/tool/Makefile.am | 17 +++++++++++++---- src/tool/SConscript | 19 +++++++++++++++---- src/tool/hello.c | 4 +++- {admin => src/tool}/rsvg-convert.c | 0 {admin => src/tool}/vgsuppression.c | 0 9 files changed, 39 insertions(+), 66 deletions(-) delete mode 100644 admin/Makefile.am delete mode 100644 admin/SConscript rename {admin => src/tool}/rsvg-convert.c (100%) rename {admin => src/tool}/vgsuppression.c (100%) diff --git a/Makefile.am b/Makefile.am index a709c1230..c8703c6fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,9 +41,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/ \ # Only use subdirs if really needed, prefer the include scheme below #SUBDIRS += -# administrative tools -include $(top_srcdir)/admin/Makefile.am - # core include $(top_srcdir)/src/lib/Makefile.am include $(top_srcdir)/src/proc/Makefile.am diff --git a/SConstruct b/SConstruct index 97e232ef5..8a2316996 100644 --- a/SConstruct +++ b/SConstruct @@ -344,10 +344,10 @@ def defineBuildTargets(env, artifacts): # the Lumiera GTK GUI - envgtk = env.Clone() - envgtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','librsvg-2.0','xv','xext','sm']) - envgtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) - objgui = srcSubtree(envgtk,'$SRCDIR/gui') + envGtk = env.Clone() + envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','librsvg-2.0','xv','xext','sm']) + envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core) + objgui = srcSubtree(envGtk,'$SRCDIR/gui') # render and install Icons vector_icon_dir = env.subst('$ICONDIR/svg') @@ -356,17 +356,16 @@ def defineBuildTargets(env, artifacts): + [env.IconCopy(f) for f in scanSubtree(prerendered_icon_dir, ['*.png'])] ) - guimodule = envgtk.LoadableModule('$LIBDIR/gtk_gui', objgui, SHLIBPREFIX='', SHLIBSUFFIX='.lum') + guimodule = envGtk.LoadableModule('$LIBDIR/gtk_gui', objgui, SHLIBPREFIX='', SHLIBSUFFIX='.lum') artifacts['lumigui'] = ( guimodule - + envgtk.Program('$BINDIR/lumigui', objgui ) + + envGtk.Program('$BINDIR/lumigui', objgui ) + env.Install('$BINDIR', env.Glob('$SRCDIR/gui/*.rc')) + artifacts['icons'] ) # call subdir SConscript(s) for independent components - SConscript(dirs=[SRCDIR+'/tool'], exports='env artifacts core') - SConscript(dirs=['admin'], exports='env envgtk artifacts core') - SConscript(dirs=[TESTDIR], exports='env envPlu artifacts core') + SConscript(dirs=[SRCDIR+'/tool'], exports='env envGtk artifacts core') + SConscript(dirs=[TESTDIR], exports='env envPlu artifacts core') diff --git a/admin/Makefile.am b/admin/Makefile.am deleted file mode 100644 index a8d2da160..000000000 --- a/admin/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (C) Lumiera.org -# 2008, Christian Thaeter -# -# 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. - -admin_srcdir = $(top_srcdir)/admin - -noinst_PROGRAMS += vgsuppression -vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c -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 - -noinst_PROGRAMS += rsvg-convert -rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c -rsvg_convert_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS) -std=gnu99 -Wall -Werror -rsvg_convert_LDADD = -lcairo -lglib-2.0 -lgthread-2.0 -lrsvg-2 diff --git a/admin/SConscript b/admin/SConscript deleted file mode 100644 index 2737bab7e..000000000 --- a/admin/SConscript +++ /dev/null @@ -1,17 +0,0 @@ -# -*- python -*- -## -## SConscript - SCons buildscript for helper tools (called by SConstruct) -## - -Import('env','envgtk','artifacts','core') - -vgsuppr = env.Program('#$BINDIR/vgsuppression',['vgsuppression.c']+core) -rsvg = envgtk.Program('#$BINDIR/rsvg-convert','rsvg-convert.c') - -artifacts['tools'] += [ vgsuppr ## for suppressing false valgrind alarms - + rsvg ## for rendering SVG icons (uses librsvg) - ] - -# Rendering the SVG Icons depends on rsvg-convert -env.Depends(artifacts['icons'], rsvg) - diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am index 64f8fa182..3d5599bdb 100644 --- a/src/tool/Makefile.am +++ b/src/tool/Makefile.am @@ -18,10 +18,19 @@ lumitool_srcdir = $(top_srcdir)/src/tool noinst_PROGRAMS += luidgen - luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror luidgen_CPPFLAGS = -I$(top_srcdir)/src/ -luidgen_SOURCES = \ - $(lumitool_srcdir)/luidgen.c +luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl +luidgen_SOURCES = $(lumitool_srcdir)/luidgen.c -luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) liblumieracommon.la liblumieraproc.la -lboost_regex-mt -lboost_program_options-mt -ldl + +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 = $(admin_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 +rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c diff --git a/src/tool/SConscript b/src/tool/SConscript index 0b6a84291..0ca19490d 100644 --- a/src/tool/SConscript +++ b/src/tool/SConscript @@ -3,13 +3,24 @@ ## SConscript - SCons buildscript for tool subdirectory (called by SConstruct) ## -Import('env','artifacts','core') +Import('env','envGtk','artifacts','core') support_lib = artifacts['support'] -# build the ubiquitous Hello World application (note: C source) -artifacts['tools'] = [ env.Program('#$BINDIR/hello-world','hello.c') - + env.Program('#$BINDIR/luidgen', ['luidgen.c'] + support_lib) +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') + + +# build additional test and administrative tools.... +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 ] +# Rendering the SVG Icons depends on rsvg-convert +env.Depends(artifacts['icons'], rsvg) + diff --git a/src/tool/hello.c b/src/tool/hello.c index d75f55f94..befad1f21 100644 --- a/src/tool/hello.c +++ b/src/tool/hello.c @@ -7,6 +7,8 @@ int main(int argc, char* argv[]) { - printf("hello lumiera world"); + (void)argc; + (void)argv; + printf("hello lumiera world\n"); return 0; } diff --git a/admin/rsvg-convert.c b/src/tool/rsvg-convert.c similarity index 100% rename from admin/rsvg-convert.c rename to src/tool/rsvg-convert.c diff --git a/admin/vgsuppression.c b/src/tool/vgsuppression.c similarity index 100% rename from admin/vgsuppression.c rename to src/tool/vgsuppression.c