From 990f7bb7694e0472ed6ad165e0724864539071cd Mon Sep 17 00:00:00 2001 From: pabs3 Date: Sun, 12 Apr 2009 12:23:09 +0000 Subject: [PATCH] Reformat and clean up the automake files git-svn-id: https://synfig.svn.sourceforge.net/svnroot/synfig@2358 1f10aa63-cdf2-0310-b900-c93c546f37ac --- ETL/trunk/ETL/Makefile.am | 79 ++++- ETL/trunk/Makefile.am | 50 ++- ETL/trunk/test/Makefile.am | 52 ++- synfig-core/trunk/Makefile.am | 90 ++++- synfig-core/trunk/examples/Makefile.am | 39 +- synfig-core/trunk/examples/walk/Makefile.am | 12 +- synfig-core/trunk/src/Makefile.am | 13 +- synfig-core/trunk/src/modules/Makefile.am | 58 ++- synfig-core/trunk/src/modules/example/Makefile.am | 35 +- .../trunk/src/modules/lyr_freetype/Makefile.am | 45 ++- synfig-core/trunk/src/modules/lyr_std/Makefile.am | 72 +++- synfig-core/trunk/src/modules/mod_bmp/Makefile.am | 39 +- synfig-core/trunk/src/modules/mod_dv/Makefile.am | 40 ++- .../trunk/src/modules/mod_ffmpeg/Makefile.am | 40 ++- .../trunk/src/modules/mod_filter/Makefile.am | 48 ++- .../trunk/src/modules/mod_geometry/Makefile.am | 53 ++- synfig-core/trunk/src/modules/mod_gif/Makefile.am | 37 +- .../trunk/src/modules/mod_gradient/Makefile.am | 41 ++- .../trunk/src/modules/mod_imagemagick/Makefile.am | 40 ++- synfig-core/trunk/src/modules/mod_jpeg/Makefile.am | 43 ++- .../trunk/src/modules/mod_libavcodec/Makefile.am | 45 ++- .../trunk/src/modules/mod_magickpp/Makefile.am | 42 ++- synfig-core/trunk/src/modules/mod_mng/Makefile.am | 45 ++- .../trunk/src/modules/mod_noise/Makefile.am | 38 +- .../trunk/src/modules/mod_openexr/Makefile.am | 41 ++- .../trunk/src/modules/mod_particle/Makefile.am | 39 +- synfig-core/trunk/src/modules/mod_png/Makefile.am | 43 ++- synfig-core/trunk/src/modules/mod_ppm/Makefile.am | 35 +- .../trunk/src/modules/mod_yuv420p/Makefile.am | 36 +- .../trunk/src/modules/mptr_mplayer/Makefile.am | 27 +- synfig-core/trunk/src/synfig/Makefile.am | 316 ++++++++++++++--- synfig-core/trunk/src/tool/Makefile.am | 30 +- synfig-studio/trunk/Makefile.am | 64 +++- synfig-studio/trunk/build_tools/Makefile.am | 2 +- synfig-studio/trunk/images/Makefile.am | 206 +++++++++-- synfig-studio/trunk/src/Makefile.am | 23 +- synfig-studio/trunk/src/gtkmm/Makefile.am | 393 +++++++++++++++++---- synfig-studio/trunk/src/synfigapp/Makefile.am | 302 ++++++++++++---- 38 files changed, 2170 insertions(+), 483 deletions(-) diff --git a/ETL/trunk/ETL/Makefile.am b/ETL/trunk/ETL/Makefile.am index 68ccdda..b08fdcf 100644 --- a/ETL/trunk/ETL/Makefile.am +++ b/ETL/trunk/ETL/Makefile.am @@ -1,15 +1,86 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in +MAINTAINERCLEANFILES = \ + Makefile.in + +CLEANFILES = \ + $(top_builddir)/ETL/etl_profile.h -CLEANFILES=$(top_builddir)/ETL/etl_profile.h etldir = $(includedir)/ETL -etl_HEADERS= value _value.h rect _rect.h misc _misc.h ref_count _ref_count.h angle fastangle handle ipc thread fixed random clock hermite calculus stringf trivial spline _stringf.h _bspline.h _calculus.h _mutex_null.h _hermite.h _curve_func.h _clock_base.h _clock_system.h _clock_gettimeofday.h _random.h _angle.h _fastangle.h _curve.h _handle.h _thread.h _mutex_pthreads.h _mutex_win32.h _condition.h _rwlock.h smach _smach.h _trivial.h _fixed.h etl_config.h $(top_builddir)/ETL/etl_profile.h _fastangle_tables.h bezier _bezier.h _bezier_angle.h _status.h status pen _pen.h boxblur _boxblur.h gaussian _gaussian.h surface _surface.h smart_ptr _smart_ptr.h _clock_win32hpcount.h mutex _mutex_pthreads_simple.h +etl_HEADERS = \ + value \ + _value.h \ + rect \ + _rect.h \ + misc \ + _misc.h \ + ref_count \ + _ref_count.h \ + angle \ + fastangle \ + handle \ + ipc \ + thread \ + fixed \ + random \ + clock \ + hermite \ + calculus \ + stringf \ + trivial \ + spline \ + _stringf.h \ + _bspline.h \ + _calculus.h \ + _mutex_null.h \ + _hermite.h \ + _curve_func.h \ + _clock_base.h \ + _clock_system.h \ + _clock_gettimeofday.h \ + _random.h \ + _angle.h \ + _fastangle.h \ + _curve.h \ + _handle.h \ + _thread.h \ + _mutex_pthreads.h \ + _mutex_win32.h \ + _condition.h \ + _rwlock.h \ + smach \ + _smach.h \ + _trivial.h \ + _fixed.h \ + etl_config.h \ + $(top_builddir)/ETL/etl_profile.h \ + _fastangle_tables.h \ + bezier \ + _bezier.h \ + _bezier_angle.h \ + _status.h \ + status \ + pen \ + _pen.h \ + boxblur \ + _boxblur.h \ + gaussian \ + _gaussian.h \ + surface \ + _surface.h \ + smart_ptr \ + _smart_ptr.h \ + _clock_win32hpcount.h \ + mutex \ + _mutex_pthreads_simple.h + $(top_builddir)/ETL/etl_profile.h:$(top_builddir)/ETL/etl_profile_.h sed "s/PACKAGE/ETL/g;" < $(top_builddir)/ETL/etl_profile_.h > $(top_builddir)/ETL/etl_profile.h + # FIXME: figure out why this is in SVN, but isn't installed -EXTRA_DIST=_bit_rotate.h +EXTRA_DIST = \ + _bit_rotate.h diff --git a/ETL/trunk/Makefile.am b/ETL/trunk/Makefile.am index 84d0c4e..48447b7 100644 --- a/ETL/trunk/Makefile.am +++ b/ETL/trunk/Makefile.am @@ -1,22 +1,60 @@ # $Id$ -MAINTAINERCLEANFILES=COPYING INSTALL config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in doxygen.cfg +MAINTAINERCLEANFILES = \ + COPYING \ + INSTALL \ + config/config.guess \ + config/config.sub \ + config/ltmain.sh \ + config/install-sh \ + config/mkinstalldirs \ + config/aclocal.m4 \ + config/missing \ + config/texinfo.tex \ + config/depcomp \ + aclocal.m4 \ + config.h.in \ + configure \ + stamp-h.in \ + Makefile.in \ + config.log \ + config.status \ + .doc_stamp \ + .DS_Store \ + include/etl_profile.h.in \ + doxygen.cfg + + +SUBDIRS = \ + ETL \ + test -SUBDIRS=ETL test # Install the pkg-config file: pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ETL.pc #Install the -config/m4 alternative to pkg-config: -bin_SCRIPTS=ETL-config -aclocaldir = $(prefix)/share/aclocal +bin_SCRIPTS = ETL-config +aclocaldir = $(prefix)/share/aclocal ACLOCAL_AMFLAGS = -I m4 -EXTRA_DIST=COPYING m4/subs.m4 config/depcomp m4/cxx_macros.m4 ETL.pbproj/project.pbxproj ETL.pbproj/etl_profile.h ETL.pbproj/frameworkfix.cpp ETL-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg ETL.pc.in +EXTRA_DIST = \ + COPYING \ + m4/subs.m4 \ + config/depcomp \ + m4/cxx_macros.m4 \ + ETL.pbproj/project.pbxproj \ + ETL.pbproj/etl_profile.h \ + ETL.pbproj/frameworkfix.cpp \ + ETL-config.in \ + m4/ETL.m4 \ + doxygen.cfg.in \ + doxygen.cfg \ + ETL.pc.in + -CVS=cvs SVN=svn TAG=@PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@ diff --git a/ETL/trunk/test/Makefile.am b/ETL/trunk/test/Makefile.am index 16988a2..afe5ca7 100644 --- a/ETL/trunk/test/Makefile.am +++ b/ETL/trunk/test/Makefile.am @@ -1,13 +1,47 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -AM_CXXFLAGS=@CXXFLAGS@ -I$(top_srcdir) -I$(top_builddir)/ETL -DEFAULT_INCLUDES=-I$(top_srcdir) -I$(top_builddir)/ETL -#TESTS=fixed clock handle angle random hermite stringf pen surface smart_ptr benchmark spline value -TESTS=fixed clock handle angle random hermite stringf pen surface smart_ptr benchmark +MAINTAINERCLEANFILES = \ + Makefile.in -#check_PROGRAMS=fixed handle clock angle random hermite stringf pen surface smart_ptr benchmark smach spline value -check_PROGRAMS=fixed handle clock angle random hermite stringf pen surface smart_ptr benchmark smach +AM_CXXFLAGS = \ + @CXXFLAGS@ + -I$(top_srcdir) + -I$(top_builddir)/ETL + +DEFAULT_INCLUDES = \ + -I$(top_srcdir) + -I$(top_builddir)/ETL + +TESTS = \ + fixed \ + clock \ + handle \ + angle \ + random \ + hermite \ + stringf \ + pen \ + surface \ + smart_ptr \ + benchmark +# spline \ +# value + +check_PROGRAMS = \ + fixed \ + handle \ + clock \ + angle \ + random \ + hermite \ + stringf \ + pen \ + surface \ + smart_ptr \ + benchmark \ + smach +# spline \ +# value benchmark_SOURCES=benchmark.cpp smart_ptr_SOURCES=smart_ptr.cpp @@ -25,4 +59,6 @@ stringf_SOURCES=stringf.cpp #value_SOURCES=value.cpp # FIXME: fix compiler errors for the spline and value tests. -EXTRA_DIST=spline.cpp value.cpp +EXTRA_DIST = \ + spline.cpp \ + value.cpp diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am index 890c0d3..bb201ca 100644 --- a/synfig-core/trunk/Makefile.am +++ b/synfig-core/trunk/Makefile.am @@ -1,21 +1,88 @@ # $Id$ -MAINTAINERCLEANFILES=COPYING INSTALL synfig.pc synfig-$(VERSION).tar.gz doxygen.cfg config/config.guess config/config.sub config/ltmain.sh config/ltmain.sh.orig config/ltmain.sh.rej config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store include/etl_profile.h.in libltdl/COPYING.LIB libltdl/Makefile.in libltdl/acinclude.m4 libltdl/config-h.in libltdl/configure.in libltdl/ltdl.h libltdl/Makefile.am libltdl/README libltdl/aclocal.m4 libltdl/configure libltdl/ltdl.c libltdl/stamp-h.in +MAINTAINERCLEANFILES = \ + COPYING \ + INSTALL \ + synfig.pc \ + synfig-$(VERSION).tar.gz \ + doxygen.cfg \ + config/config.guess \ + config/config.sub \ + config/ltmain.sh \ + config/ltmain.sh.orig \ + config/ltmain.sh.rej \ + config/install-sh \ + config/mkinstalldirs \ + config/aclocal.m4 \ + config/missing \ + config/texinfo.tex \ + config/depcomp \ + aclocal.m4 \ + config.h.in \ + configure \ + stamp-h.in \ + Makefile.in \ + config.log \ + config.status \ + .doc_stamp \ + .DS_Store \ + include/etl_profile.h.in \ + libltdl/COPYING.LIB \ + libltdl/Makefile.in \ + libltdl/acinclude.m4 \ + libltdl/config-h.in \ + libltdl/configure.in \ + libltdl/ltdl.h \ + libltdl/Makefile.am \ + libltdl/README \ + libltdl/aclocal.m4 \ + libltdl/configure \ + libltdl/ltdl.c \ + libltdl/stamp-h.in + + +SUBDIRS = \ + libltdl \ + src \ + examples \ + po -SUBDIRS=libltdl src examples po - # Install the pkg-config file: pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = synfig.pc -bin_SCRIPTS=synfig-config - -ACLOCAL_AMFLAGS=-I m4 +bin_SCRIPTS = synfig-config + +ACLOCAL_AMFLAGS = -I m4 + +EXTRA_DIST = \ + ChangeLog.old \ + TODO \ + m4/subs.m4 \ + config/package \ + doc/hw-gfx-mapping.txt \ + win32build.sh \ + macosxbuild.sh \ + win32inst.nsi.in \ + COPYING \ + config/depcomp \ + m4/synfig.m4 \ + m4/cxx_macros.m4 \ + synfig.kdevprj \ + synfig-config.in \ + m4/ETL.m4 \ + doxygen.cfg.in \ + doxygen.cfg \ + synfig.pc.in \ + m4/pkgconfig.m4 \ + m4/libxml++.m4 \ + @PACKAGE_TARNAME@.pc.in \ + pkg-info/macosx/core-resources/ReadMe.txt \ + pkg-info/macosx/core-resources/Welcome.txt \ + pkg-info/macosx/core-resources/install.sh -EXTRA_DIST=ChangeLog.old TODO m4/subs.m4 config/package doc/hw-gfx-mapping.txt win32build.sh macosxbuild.sh win32inst.nsi.in COPYING config/depcomp m4/synfig.m4 m4/cxx_macros.m4 synfig.kdevprj synfig-config.in m4/ETL.m4 doxygen.cfg.in doxygen.cfg synfig.pc.in m4/pkgconfig.m4 m4/libxml++.m4 @PACKAGE_TARNAME@.pc.in pkg-info/macosx/core-resources/ReadMe.txt pkg-info/macosx/core-resources/Welcome.txt pkg-info/macosx/core-resources/install.sh -CVS=cvs GREP=grep PRINTF=printf SH=sh @@ -46,13 +113,6 @@ ChangeLog: -svn update svn2cl --include-rev || touch ChangeLog -#tagstable: -# $(CVS) tag -F stable - -#tagrelease: -# $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@ - - listfixmes: -@echo -@echo -- List of pending FIXMEs diff --git a/synfig-core/trunk/examples/Makefile.am b/synfig-core/trunk/examples/Makefile.am index 718eecb..c006360 100644 --- a/synfig-core/trunk/examples/Makefile.am +++ b/synfig-core/trunk/examples/Makefile.am @@ -1,3 +1,36 @@ -SUBDIRS=walk -MAINTAINERCLEANFILES=Makefile.in -EXTRA_DIST= about_dialog.sifz backdrop.sifz business_card.sifz candy.sifz cells.sifz eye.sifz eyes.sifz gamma.sifz gradient.sifz headmo.sifz installer-logo.sifz japan.sifz logo.sifz macwolfen.sifz Makefile.am mandelbrot.sifz newjulia.sifz newjulia2.sifz noise.sifz pirates.sifz preambletaffy.sifz prologue_kid.sifz sparkle.sifz splat.sifz star.sifz wallpaper.sifz warpcube.sifz warptext.sifz z_depth_test.sifz +SUBDIRS = \ + walk + +MAINTAINERCLEANFILES = \ + Makefile.in + +EXTRA_DIST = \ + about_dialog.sifz \ + backdrop.sifz \ + business_card.sifz \ + candy.sifz \ + cells.sifz \ + eye.sifz \ + eyes.sifz \ + gamma.sifz \ + gradient.sifz \ + headmo.sifz \ + installer-logo.sifz \ + japan.sifz \ + logo.sifz \ + macwolfen.sifz \ + Makefile.am \ + mandelbrot.sifz \ + newjulia.sifz \ + newjulia2.sifz \ + noise.sifz \ + pirates.sifz \ + preambletaffy.sifz \ + prologue_kid.sifz \ + sparkle.sifz \ + splat.sifz \ + star.sifz \ + wallpaper.sifz \ + warpcube.sifz \ + warptext.sifz \ + z_depth_test.sifz diff --git a/synfig-core/trunk/examples/walk/Makefile.am b/synfig-core/trunk/examples/walk/Makefile.am index cf7ee25..7ac6f9e 100644 --- a/synfig-core/trunk/examples/walk/Makefile.am +++ b/synfig-core/trunk/examples/walk/Makefile.am @@ -1,2 +1,10 @@ -MAINTAINERCLEANFILES=Makefile.in -EXTRA_DIST=animation.lst frame_01.jpg frame_02.jpg frame_03.jpg frame_04.jpg walk.sifz +MAINTAINERCLEANFILES = \ + Makefile.in + +EXTRA_DIST = \ + animation.lst \ + frame_01.jpg \ + frame_02.jpg \ + frame_03.jpg \ + frame_04.jpg \ + walk.sifz diff --git a/synfig-core/trunk/src/Makefile.am b/synfig-core/trunk/src/Makefile.am index 0db496d..8639170 100644 --- a/synfig-core/trunk/src/Makefile.am +++ b/synfig-core/trunk/src/Makefile.am @@ -1,6 +1,13 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -SUBDIRS=synfig modules tool -EXTRA_DIST=template.cpp template.h +MAINTAINERCLEANFILES = \ + Makefile.in +SUBDIRS = \ + synfig \ + modules \ + tool + +EXTRA_DIST = \ + template.cpp \ + template.h diff --git a/synfig-core/trunk/src/modules/Makefile.am b/synfig-core/trunk/src/modules/Makefile.am index 11cb997..0e76ee7 100644 --- a/synfig-core/trunk/src/modules/Makefile.am +++ b/synfig-core/trunk/src/modules/Makefile.am @@ -1,9 +1,59 @@ # $Id$ -synfiglibdir=@SYNFIGLIB_DIR@ +synfiglibdir = @SYNFIGLIB_DIR@ -MAINTAINERCLEANFILES=Makefile.in -SUBDIRS=mod_particle mod_filter mod_yuv420p mod_gif mod_gradient mod_geometry mod_noise mod_libavcodec mod_jpeg mod_openexr mod_bmp mod_ppm mod_png mod_dv mod_imagemagick mod_ffmpeg lyr_freetype lyr_std mod_mng mod_magickpp example -EXTRA_DIST=untemplate.nsh template.nsh example/simplecircle.h example/simplecircle.cpp example/filledrect.h example/main.cpp example/Makefile.am example/filledrect.cpp example/metaballs.cpp example/metaballs.h mod_mng/trgt_mng.h mod_mng/unmod_mng.nsh mod_mng/main.cpp mod_mng/Makefile.am mod_mng/mod_mng.nsh mod_mng/trgt_mng.cpp mptr_mplayer/main.cpp mptr_mplayer/mptr_mplayer.h mptr_mplayer/Makefile.am mptr_mplayer/mptr_mplayer.cpp mod_magickpp/trgt_magickpp.h mod_magickpp/unmod_magickpp.nsh mod_magickpp/main.cpp mod_magickpp/Makefile.am mod_magickpp/mod_magickpp.nsh mod_magickpp/trgt_magickpp.cpp +MAINTAINERCLEANFILES = \ + Makefile.in + +SUBDIRS = \ + mod_particle \ + mod_filter \ + mod_yuv420p \ + mod_gif \ + mod_gradient \ + mod_geometry \ + mod_noise \ + mod_libavcodec \ + mod_jpeg \ + mod_openexr \ + mod_bmp \ + mod_ppm \ + mod_png \ + mod_dv \ + mod_imagemagick \ + mod_ffmpeg \ + lyr_freetype \ + lyr_std \ + mod_mng \ + mod_magickpp \ + example + +EXTRA_DIST = \ + untemplate.nsh \ + template.nsh \ + example/simplecircle.h \ + example/simplecircle.cpp \ + example/filledrect.h \ + example/main.cpp \ + example/Makefile.am \ + example/filledrect.cpp \ + example/metaballs.cpp \ + example/metaballs.h \ + mod_mng/trgt_mng.h \ + mod_mng/unmod_mng.nsh \ + mod_mng/main.cpp \ + mod_mng/Makefile.am \ + mod_mng/mod_mng.nsh \ + mod_mng/trgt_mng.cpp \ + mptr_mplayer/main.cpp \ + mptr_mplayer/mptr_mplayer.h \ + mptr_mplayer/Makefile.am \ + mptr_mplayer/mptr_mplayer.cpp \ + mod_magickpp/trgt_magickpp.h \ + mod_magickpp/unmod_magickpp.nsh \ + mod_magickpp/main.cpp \ + mod_magickpp/Makefile.am \ + mod_magickpp/mod_magickpp.nsh \ + mod_magickpp/trgt_magickpp.cpp sysconf_DATA = synfig_modules.cfg diff --git a/synfig-core/trunk/src/modules/example/Makefile.am b/synfig-core/trunk/src/modules/example/Makefile.am index c526e75..1d38d74 100644 --- a/synfig-core/trunk/src/modules/example/Makefile.am +++ b/synfig-core/trunk/src/modules/example/Makefile.am @@ -1,13 +1,34 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libexample.la -libexample_la_SOURCES = main.cpp simplecircle.cpp simplecircle.h filledrect.h filledrect.cpp metaballs.h metaballs.cpp -libexample_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libexample_la_LDFLAGS = -module -no-undefined -avoid-version -libexample_la_CXXFLAGS = @SYNFIG_CFLAGS@ + +libexample_la_SOURCES = \ + main.cpp \ + simplecircle.cpp \ + simplecircle.h \ + filledrect.h \ + filledrect.cpp \ + metaballs.h \ + metaballs.cpp + +libexample_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +libexample_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libexample_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ diff --git a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am index 069a66e..a778e78 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am +++ b/synfig-core/trunk/src/modules/lyr_freetype/Makefile.am @@ -1,24 +1,49 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src -AM_CXXFLAGS=@CXXFLAGS@ @FREETYPE_CFLAGS@ +MAINTAINERCLEANFILES = Makefile.in + +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src + +AM_CXXFLAGS = \ + @CXXFLAGS@ \ + @FREETYPE_CFLAGS@ + moduledir=@MODULE_DIR@ if WITH_FREETYPE + module_LTLIBRARIES = liblyr_freetype.la -liblyr_freetype_la_SOURCES = main.cpp lyr_freetype.cpp lyr_freetype.h -liblyr_freetype_la_LIBADD = ../../synfig/libsynfig.la @FREETYPE_LIBS@ @SYNFIG_LIBS@ -liblyr_freetype_la_LDFLAGS = -module -no-undefined -avoid-version -liblyr_freetype_la_CXXFLAGS = @SYNFIG_CFLAGS@ @FREETYPE_CFLAGS@ + +liblyr_freetype_la_SOURCES = \ + main.cpp \ + lyr_freetype.cpp \ + lyr_freetype.h + +liblyr_freetype_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @FREETYPE_LIBS@ \ + @SYNFIG_LIBS@ + +liblyr_freetype_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +liblyr_freetype_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ \ + @FREETYPE_CFLAGS@ + if WITH_FONTCONFIG liblyr_freetype_la_LIBADD += @FONTCONFIG_LIBS@ liblyr_freetype_la_CXXFLAGS += @FONTCONFIG_CFLAGS@ -else endif -else + endif -EXTRA_DIST= lyr_freetype.nsh unlyr_freetype.nsh +EXTRA_DIST = \ + lyr_freetype.nsh \ + unlyr_freetype.nsh diff --git a/synfig-core/trunk/src/modules/lyr_std/Makefile.am b/synfig-core/trunk/src/modules/lyr_std/Makefile.am index 2cfbb76..d1da4f3 100644 --- a/synfig-core/trunk/src/modules/lyr_std/Makefile.am +++ b/synfig-core/trunk/src/modules/lyr_std/Makefile.am @@ -1,14 +1,70 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = liblyr_std.la -liblyr_std_la_SOURCES = main.cpp timeloop.cpp timeloop.h warp.cpp warp.h xorpattern.cpp booleancurve.h booleancurve.cpp bevel.cpp bevel.h shade.cpp shade.h twirl.cpp twirl.h stretch.cpp stretch.h xorpattern.h clamp.cpp clamp.h supersample.cpp supersample.h insideout.cpp insideout.h julia.cpp julia.h rotate.cpp rotate.h mandelbrot.cpp mandelbrot.h zoom.h zoom.cpp import.cpp import.h translate.h translate.cpp sphere_distort.h sphere_distort.cpp curvewarp.cpp -liblyr_std_la_CXXFLAGS = @SYNFIG_CFLAGS@ -liblyr_std_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -liblyr_std_la_LDFLAGS = -module -no-undefined -avoid-version -EXTRA_DIST= lyr_std.nsh unlyr_std.nsh + +liblyr_std_la_SOURCES = \ + main.cpp \ + timeloop.cpp \ + timeloop.h \ + warp.cpp \ + warp.h \ + xorpattern.cpp \ + booleancurve.h \ + booleancurve.cpp \ + bevel.cpp \ + bevel.h \ + shade.cpp \ + shade.h \ + twirl.cpp \ + twirl.h \ + stretch.cpp \ + stretch.h \ + xorpattern.h \ + clamp.cpp \ + clamp.h \ + supersample.cpp \ + supersample.h \ + insideout.cpp \ + insideout.h \ + julia.cpp \ + julia.h \ + rotate.cpp \ + rotate.h \ + mandelbrot.cpp \ + mandelbrot.h \ + zoom.h \ + zoom.cpp \ + import.cpp \ + import.h \ + translate.h \ + translate.cpp \ + sphere_distort.h \ + sphere_distort.cpp \ + curvewarp.cpp + +liblyr_std_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +liblyr_std_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +liblyr_std_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + +EXTRA_DIST = \ + lyr_std.nsh \ + unlyr_std.nsh diff --git a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am index b6f2e03..d367d2e 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_bmp/Makefile.am @@ -1,14 +1,37 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_bmp.la -libmod_bmp_la_SOURCES = main.cpp trgt_bmp.cpp trgt_bmp.h mptr_bmp.cpp mptr_bmp.h -libmod_bmp_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_bmp_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_bmp_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -EXTRA_DIST= mod_bmp.nsh unmod_bmp.nsh + +libmod_bmp_la_SOURCES = \ + main.cpp \ + trgt_bmp.cpp \ + trgt_bmp.h \ + mptr_bmp.cpp \ + mptr_bmp.h + +libmod_bmp_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_bmp_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_bmp_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + + +EXTRA_DIST = \ + mod_bmp.nsh \ + unmod_bmp.nsh diff --git a/synfig-core/trunk/src/modules/mod_dv/Makefile.am b/synfig-core/trunk/src/modules/mod_dv/Makefile.am index 91c5286..bbd1f63 100644 --- a/synfig-core/trunk/src/modules/mod_dv/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_dv/Makefile.am @@ -1,17 +1,39 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if WITH_LIBDV + module_LTLIBRARIES = libmod_dv.la -libmod_dv_la_SOURCES = main.cpp trgt_dv.cpp trgt_dv.h -libmod_dv_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_dv_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_dv_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_dv_la_SOURCES = \ + main.cpp \ + trgt_dv.cpp \ + trgt_dv.h + +libmod_dv_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_dv_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_dv_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_dv.nsh unmod_dv.nsh + + +EXTRA_DIST = \ + mod_dv.nsh \ + unmod_dv.nsh diff --git a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am index 9d680de..d67be26 100644 --- a/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_ffmpeg/Makefile.am @@ -1,19 +1,41 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if WITH_FFMPEG + module_LTLIBRARIES = libmod_ffmpeg.la -libmod_ffmpeg_la_SOURCES = main.cpp mptr_ffmpeg.cpp mptr_ffmpeg.h trgt_ffmpeg.cpp trgt_ffmpeg.h -libmod_ffmpeg_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_ffmpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_ffmpeg_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_ffmpeg_la_SOURCES = \ + main.cpp \ + mptr_ffmpeg.cpp \ + mptr_ffmpeg.h \ + trgt_ffmpeg.cpp \ + trgt_ffmpeg.h + +libmod_ffmpeg_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_ffmpeg_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_ffmpeg_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_ffmpeg.nsh unmod_ffmpeg.nsh +EXTRA_DIST = \ + mod_ffmpeg.nsh \ + unmod_ffmpeg.nsh diff --git a/synfig-core/trunk/src/modules/mod_filter/Makefile.am b/synfig-core/trunk/src/modules/mod_filter/Makefile.am index f51d919..45f06e1 100644 --- a/synfig-core/trunk/src/modules/mod_filter/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_filter/Makefile.am @@ -1,14 +1,46 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_filter.la -libmod_filter_la_SOURCES = blur.cpp blur.h colorcorrect.cpp colorcorrect.h halftone2.cpp halftone2.h lumakey.cpp lumakey.h radialblur.cpp radialblur.h main.cpp halftone.cpp halftone.h halftone3.cpp halftone3.h -libmod_filter_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_filter_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libmod_filter_la_LDFLAGS = -module -no-undefined -avoid-version -EXTRA_DIST= mod_filter.nsh unmod_filter.nsh + +libmod_filter_la_SOURCES = \ + blur.cpp \ + blur.h \ + colorcorrect.cpp \ + colorcorrect.h \ + halftone2.cpp \ + halftone2.h \ + lumakey.cpp \ + lumakey.h \ + radialblur.cpp \ + radialblur.h \ + main.cpp \ + halftone.cpp \ + halftone.h \ + halftone3.cpp \ + halftone3.h + +libmod_filter_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_filter_la_LIBADD = \ + ../../synfig/libsynfig.la @SYNFIG_LIBS@ + +libmod_filter_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + +EXTRA_DIST = \ + mod_filter.nsh \ + unmod_filter.nsh diff --git a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am index 187403f..335bb1c 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_geometry/Makefile.am @@ -1,18 +1,51 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src # GCC on MacOS X does not take kindly to the -ffastmath optimization # in this module for some reason. -AM_CXXFLAGS=`echo @CXXFLAGS@ | sed s/-ffast-math//g` +AM_CXXFLAGS = \ + `echo @CXXFLAGS@ | sed s/-ffast-math//g` -moduledir=@MODULE_DIR@ -module_LTLIBRARIES = libmod_geometry.la -libmod_geometry_la_SOURCES = rectangle.cpp rectangle.h star.h star.cpp checkerboard.cpp checkerboard.h circle.cpp circle.h region.h region.cpp outline.h outline.cpp main.cpp -libmod_geometry_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_geometry_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libmod_geometry_la_LDFLAGS = -module -no-undefined -avoid-version -EXTRA_DIST= mod_geometry.nsh unmod_geometry.nsh +moduledir = @MODULE_DIR@ + +module_LTLIBRARIES = \ + libmod_geometry.la + +libmod_geometry_la_SOURCES = \ + rectangle.cpp \ + rectangle.h \ + star.h \ + star.cpp \ + checkerboard.cpp \ + checkerboard.h \ + circle.cpp \ + circle.h \ + region.h \ + region.cpp \ + outline.h \ + outline.cpp \ + main.cpp + +libmod_geometry_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_geometry_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +libmod_geometry_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + +EXTRA_DIST = \ + mod_geometry.nsh \ + unmod_geometry.nsh diff --git a/synfig-core/trunk/src/modules/mod_gif/Makefile.am b/synfig-core/trunk/src/modules/mod_gif/Makefile.am index 4ec29b3..c59e448 100644 --- a/synfig-core/trunk/src/modules/mod_gif/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_gif/Makefile.am @@ -1,14 +1,35 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_gif.la -libmod_gif_la_SOURCES = main.cpp trgt_gif.cpp trgt_gif.h -libmod_gif_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_gif_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_gif_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -EXTRA_DIST= mod_gif.nsh unmod_gif.nsh + +libmod_gif_la_SOURCES = \ + main.cpp \ + trgt_gif.cpp \ + trgt_gif.h + +libmod_gif_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_gif_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_gif_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + + +EXTRA_DIST = \ + mod_gif.nsh \ + unmod_gif.nsh diff --git a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am index 3cca071..cf31c5a 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_gradient/Makefile.am @@ -1,14 +1,41 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_gradient.la -libmod_gradient_la_SOURCES = curvegradient.cpp curvegradient.h lineargradient.cpp lineargradient.h conicalgradient.cpp conicalgradient.h spiralgradient.cpp spiralgradient.h radialgradient.cpp radialgradient.h main.cpp -libmod_gradient_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_gradient_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libmod_gradient_la_LDFLAGS = -module -no-undefined -avoid-version + +libmod_gradient_la_SOURCES = \ + curvegradient.cpp \ + curvegradient.h \ + lineargradient.cpp \ + lineargradient.h \ + conicalgradient.cpp \ + conicalgradient.h \ + spiralgradient.cpp \ + spiralgradient.h \ + radialgradient.cpp \ + radialgradient.h \ + main.cpp + +libmod_gradient_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_gradient_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +libmod_gradient_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + EXTRA_DIST= mod_gradient.nsh unmod_gradient.nsh diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am index 54934d4..ffc9612 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_imagemagick/Makefile.am @@ -1,19 +1,41 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if WITH_IMAGEMAGICK + module_LTLIBRARIES = libmod_imagemagick.la -libmod_imagemagick_la_SOURCES = main.cpp mptr_imagemagick.cpp mptr_imagemagick.h trgt_imagemagick.cpp trgt_imagemagick.h -libmod_imagemagick_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_imagemagick_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_imagemagick_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_imagemagick_la_SOURCES = \ + main.cpp \ + mptr_imagemagick.cpp \ + mptr_imagemagick.h \ + trgt_imagemagick.cpp \ + trgt_imagemagick.h + +libmod_imagemagick_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_imagemagick_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_imagemagick_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_imagemagick.nsh unmod_imagemagick.nsh +EXTRA_DIST = \ + mod_imagemagick.nsh \ + unmod_imagemagick.nsh diff --git a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am index 6e91c06..f963df5 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_jpeg/Makefile.am @@ -1,17 +1,42 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if HAVE_LIBJPEG + module_LTLIBRARIES = libmod_jpeg.la -libmod_jpeg_la_SOURCES = main.cpp trgt_jpeg.cpp trgt_jpeg.h mptr_jpeg.cpp mptr_jpeg.h -libmod_jpeg_la_LDFLAGS = -module @JPEG_LIBS@ -no-undefined -avoid-version -libmod_jpeg_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_jpeg_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_jpeg_la_SOURCES = \ + main.cpp \ + trgt_jpeg.cpp \ + trgt_jpeg.h \ + mptr_jpeg.cpp \ + mptr_jpeg.h + +libmod_jpeg_la_LDFLAGS = \ + -module \ + @JPEG_LIBS@ \ + -no-undefined \ + -avoid-version + +libmod_jpeg_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_jpeg_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_jpeg.nsh unmod_jpeg.nsh + + +EXTRA_DIST = \ + mod_jpeg.nsh \ + unmod_jpeg.nsh diff --git a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am index 193e321..fddc613 100644 --- a/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_libavcodec/Makefile.am @@ -1,17 +1,44 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if WITH_LIBAVCODEC + module_LTLIBRARIES = libmod_libavcodec.la -libmod_libavcodec_la_SOURCES = main.cpp trgt_av.cpp trgt_av.h mptr.cpp mptr.h -libmod_libavcodec_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_libavcodec_la_CXXFLAGS = @SYNFIG_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ -D__STDC_CONSTANT_MACROS -libmod_libavcodec_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ @LIBAVCODEC_LIBS@ @LIBSWSCALE_LIBS@ -else + +libmod_libavcodec_la_SOURCES = \ + main.cpp \ + trgt_av.cpp \ + trgt_av.h \ + mptr.cpp \ + mptr.h + +libmod_libavcodec_la_LDFLAGS = \ + -module -no-undefined -avoid-version + +libmod_libavcodec_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ \ + @LIBAVCODEC_CFLAGS@ \ + @LIBSWSCALE_CFLAGS@ \ + -D__STDC_CONSTANT_MACROS + +libmod_libavcodec_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ \ + @LIBAVCODEC_LIBS@ \ + @LIBSWSCALE_LIBS@ + endif -EXTRA_DIST= mod_libavcodec.nsh unmod_libavcodec.nsh + + +EXTRA_DIST = \ + mod_libavcodec.nsh \ + unmod_libavcodec.nsh diff --git a/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am b/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am index b37fc48..7660173 100644 --- a/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_magickpp/Makefile.am @@ -1,16 +1,40 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +MAINTAINERCLEANFILES = \ + Makefile.in -moduledir=@MODULE_DIR@ +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src + + +moduledir = @MODULE_DIR@ if HAVE_LIBMAGICKPP + module_LTLIBRARIES = libmod_magickpp.la -libmod_magickpp_la_SOURCES = main.cpp trgt_magickpp.cpp trgt_magickpp.h -libmod_magickpp_la_LDFLAGS = -module @MAGICKPP_LIBS@ -no-undefined -avoid-version -libmod_magickpp_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_magickpp_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_magickpp_la_SOURCES = \ + main.cpp \ + trgt_magickpp.cpp \ + trgt_magickpp.h + +libmod_magickpp_la_LDFLAGS = \ + -module \ + @MAGICKPP_LIBS@ \ + -no-undefined \ + -avoid-version + +libmod_magickpp_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_magickpp_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_magickpp.nsh unmod_magickpp.nsh + + +EXTRA_DIST = \ + mod_magickpp.nsh \ + unmod_magickpp.nsh diff --git a/synfig-core/trunk/src/modules/mod_mng/Makefile.am b/synfig-core/trunk/src/modules/mod_mng/Makefile.am index f256393..bdaf7b0 100644 --- a/synfig-core/trunk/src/modules/mod_mng/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_mng/Makefile.am @@ -1,16 +1,41 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +MAINTAINERCLEANFILES = \ + Makefile.in -moduledir=@MODULE_DIR@ +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src + + +moduledir = @MODULE_DIR@ if HAVE_LIBMNG -module_LTLIBRARIES = libmod_mng.la -libmod_mng_la_SOURCES = main.cpp trgt_mng.cpp trgt_mng.h -libmod_mng_la_LDFLAGS = -module @MNG_LIBS@ -no-undefined -avoid-version -libmod_mng_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_mng_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +module_LTLIBRARIES = \ + libmod_mng.la + +libmod_mng_la_SOURCES = \ + main.cpp \ + trgt_mng.cpp \ + trgt_mng.h + +libmod_mng_la_LDFLAGS = \ + -module \ + @MNG_LIBS@ \ + -no-undefined \ + -avoid-version + +libmod_mng_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_mng_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_mng.nsh unmod_mng.nsh + + +EXTRA_DIST = \ + mod_mng.nsh \ + unmod_mng.nsh diff --git a/synfig-core/trunk/src/modules/mod_noise/Makefile.am b/synfig-core/trunk/src/modules/mod_noise/Makefile.am index 2a766c5..a6830a4 100644 --- a/synfig-core/trunk/src/modules/mod_noise/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_noise/Makefile.am @@ -1,14 +1,38 @@ # $Id$ +MAINTAINERCLEANFILES = Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_noise.la -libmod_noise_la_SOURCES = random_noise.cpp random_noise.h distort.cpp distort.h noise.cpp noise.h valuenode_random.cpp valuenode_random.h main.cpp -libmod_noise_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_noise_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libmod_noise_la_LDFLAGS = -module -no-undefined -avoid-version + +libmod_noise_la_SOURCES = \ + random_noise.cpp \ + random_noise.h \ + distort.cpp \ + distort.h \ + noise.cpp \ + noise.h \ + valuenode_random.cpp \ + valuenode_random.h \ + main.cpp + +libmod_noise_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_noise_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +libmod_noise_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + EXTRA_DIST= mod_noise.nsh unmod_noise.nsh diff --git a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am index 5228249..d719c0f 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_openexr/Makefile.am @@ -1,19 +1,42 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if WITH_OPENEXR + module_LTLIBRARIES = libmod_openexr.la -libmod_openexr_la_SOURCES = main.cpp mptr_openexr.cpp mptr_openexr.h trgt_openexr.cpp trgt_openexr.h -libmod_openexr_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined -avoid-version -libmod_openexr_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ @OPENEXR_LIBS@ -libmod_openexr_la_CXXFLAGS = @SYNFIG_CFLAGS@ @OPENEXR_CFLAGS@ -else + +libmod_openexr_la_SOURCES = \ + main.cpp \ + mptr_openexr.cpp \ + mptr_openexr.h \ + trgt_openexr.cpp \ + trgt_openexr.h + +libmod_openexr_la_LDFLAGS = \ + -module \ + @PNG_LIBS@ \ + -no-undefined \ + -avoid-version + +libmod_openexr_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ @OPENEXR_LIBS@ + +libmod_openexr_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ @OPENEXR_CFLAGS@ + endif -EXTRA_DIST= mod_openexr.nsh unmod_openexr.nsh +EXTRA_DIST = \ + mod_openexr.nsh \ + unmod_openexr.nsh diff --git a/synfig-core/trunk/src/modules/mod_particle/Makefile.am b/synfig-core/trunk/src/modules/mod_particle/Makefile.am index 34b9764..ffe2a89 100644 --- a/synfig-core/trunk/src/modules/mod_particle/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_particle/Makefile.am @@ -1,14 +1,37 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_particle.la -libmod_particle_la_SOURCES = random.cpp random.h plant.cpp plant.h main.cpp -libmod_particle_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_particle_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -libmod_particle_la_LDFLAGS = -module -no-undefined -avoid-version -EXTRA_DIST= mod_particle.nsh unmod_particle.nsh + +libmod_particle_la_SOURCES = \ + random.cpp \ + random.h \ + plant.cpp \ + plant.h \ + main.cpp + +libmod_particle_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_particle_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + +libmod_particle_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + + +EXTRA_DIST = \ + mod_particle.nsh \ + unmod_particle.nsh diff --git a/synfig-core/trunk/src/modules/mod_png/Makefile.am b/synfig-core/trunk/src/modules/mod_png/Makefile.am index 2e7b46f..d36942d 100644 --- a/synfig-core/trunk/src/modules/mod_png/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_png/Makefile.am @@ -1,17 +1,42 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ if HAVE_LIBPNG + module_LTLIBRARIES = libmod_png.la -libmod_png_la_SOURCES = main.cpp trgt_png.cpp trgt_png.h mptr_png.cpp mptr_png.h -libmod_png_la_LDFLAGS = -module @PNG_LIBS@ -no-undefined -avoid-version -libmod_png_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_png_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ -else + +libmod_png_la_SOURCES = \ + main.cpp \ + trgt_png.cpp \ + trgt_png.h \ + mptr_png.cpp \ + mptr_png.h + +libmod_png_la_LDFLAGS = \ + -module \ + @PNG_LIBS@ \ + -no-undefined \ + -avoid-version + +libmod_png_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_png_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + endif -EXTRA_DIST= mod_png.nsh unmod_png.nsh + + +EXTRA_DIST = \ + mod_png.nsh \ + unmod_png.nsh diff --git a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am index ed6677b..ce8de9f 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_ppm/Makefile.am @@ -1,14 +1,35 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmod_ppm.la -libmod_ppm_la_SOURCES = main.cpp trgt_ppm.cpp trgt_ppm.h mptr_ppm.cpp mptr_ppm.h -libmod_ppm_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_ppm_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_ppm_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ + +libmod_ppm_la_SOURCES = \ + main.cpp \ + trgt_ppm.cpp \ + trgt_ppm.h \ + mptr_ppm.cpp \ + mptr_ppm.h + +libmod_ppm_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_ppm_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_ppm_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ + + EXTRA_DIST= mod_ppm.nsh unmod_ppm.nsh trgt_mpg.cpp trgt_mpg.h diff --git a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am index ae33789..09058a3 100644 --- a/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am +++ b/synfig-core/trunk/src/modules/mod_yuv420p/Makefile.am @@ -1,14 +1,34 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src + + +moduledir = @MODULE_DIR@ + +module_LTLIBRARIES = \ + libmod_yuv420p.la + +libmod_yuv420p_la_SOURCES = \ + main.cpp \ + trgt_yuv.cpp \ + trgt_yuv.h + +libmod_yuv420p_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmod_yuv420p_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ + +libmod_yuv420p_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ -moduledir=@MODULE_DIR@ -module_LTLIBRARIES = libmod_yuv420p.la -libmod_yuv420p_la_SOURCES = main.cpp trgt_yuv.cpp trgt_yuv.h -libmod_yuv420p_la_LDFLAGS = -module -no-undefined -avoid-version -libmod_yuv420p_la_CXXFLAGS = @SYNFIG_CFLAGS@ -libmod_yuv420p_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ EXTRA_DIST= mod_yuv420p.nsh unmod_yuv420p.nsh diff --git a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am index 8c8b51a..7612078 100644 --- a/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am +++ b/synfig-core/trunk/src/modules/mptr_mplayer/Makefile.am @@ -1,15 +1,30 @@ # $Id$ +MAINTAINERCLEANFILES = \ + Makefile.in -MAINTAINERCLEANFILES=Makefile.in -INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -moduledir=@MODULE_DIR@ + +moduledir = @MODULE_DIR@ module_LTLIBRARIES = libmptr_mplayer.la -libmptr_mplayer_la_SOURCES = main.cpp mptr_mplayer.cpp mptr_mplayer.h -libmptr_mplayer_la_LDFLAGS = -module -no-undefined -avoid-version -libmptr_mplayer_la_LIBADD = ../../synfig/libsynfig.la @SYNFIG_LIBS@ + +libmptr_mplayer_la_SOURCES = \ + main.cpp \ + mptr_mplayer.cpp \ + mptr_mplayer.h + +libmptr_mplayer_la_LDFLAGS = \ + -module \ + -no-undefined \ + -avoid-version + +libmptr_mplayer_la_LIBADD = \ + ../../synfig/libsynfig.la \ + @SYNFIG_LIBS@ diff --git a/synfig-core/trunk/src/synfig/Makefile.am b/synfig-core/trunk/src/synfig/Makefile.am index 9ec94e4..a406f9a 100644 --- a/synfig-core/trunk/src/synfig/Makefile.am +++ b/synfig-core/trunk/src/synfig/Makefile.am @@ -4,81 +4,299 @@ MAINTAINERCLEANFILES = \ Makefile.in INCLUDES = \ - -I$(top_builddir) -I$(top_srcdir)/src @INCLTDL@ + -I$(top_builddir) \ + -I$(top_srcdir)/src \ + @INCLTDL@ EXTRA_DIST = \ - surfacenew.cpp pch.h synfig.nsh + surfacenew.cpp \ + pch.h \ + synfig.nsh + LAYERHEADERS = \ - layer_bitmap.h layer_composite.h layer_duplicate.h layer_mime.h layer_motionblur.h \ - layer_pastecanvas.h layer_polygon.h layer_shape.h layer_solidcolor.h + layer_bitmap.h \ + layer_composite.h \ + layer_duplicate.h \ + layer_mime.h \ + layer_motionblur.h \ + layer_pastecanvas.h \ + layer_polygon.h \ + layer_shape.h \ + layer_solidcolor.h + LAYERSOURCES = \ - layer_bitmap.cpp layer_composite.cpp layer_duplicate.cpp layer_mime.cpp layer_motionblur.cpp \ - layer_pastecanvas.cpp layer_polygon.cpp layer_shape.cpp layer_solidcolor.cpp + layer_bitmap.cpp \ + layer_composite.cpp \ + layer_duplicate.cpp \ + layer_mime.cpp \ + layer_motionblur.cpp \ + layer_pastecanvas.cpp \ + layer_polygon.cpp \ + layer_shape.cpp \ + layer_solidcolor.cpp + TARGETHEADERS = \ - target_multi.h target_null.h target_null_tile.h target_scanline.h target_tile.h + target_multi.h \ + target_null.h \ + target_null_tile.h \ + target_scanline.h \ + target_tile.h + TARGETSOURCES = \ - target_multi.cpp target_null.cpp target_null_tile.cpp target_scanline.cpp target_tile.cpp + target_multi.cpp \ + target_null.cpp \ + target_null_tile.cpp \ + target_scanline.cpp \ + target_tile.cpp + IMPORTERHEADERS = \ listimporter.h + IMPORTERSOURCES = \ listimporter.cpp + VALUENODEHEADERS = \ - valuenode_add.h valuenode_anglestring.h valuenode_animated.h valuenode_atan2.h valuenode_bline.h \ - valuenode_blinecalctangent.h valuenode_blinecalcvertex.h valuenode_blinecalcwidth.h \ - valuenode_blinereversetangent.h valuenode_composite.h valuenode_const.h valuenode_cos.h \ - valuenode_dotproduct.h valuenode_duplicate.h valuenode_dynamiclist.h valuenode_exp.h \ - valuenode_gradientcolor.h valuenode_gradientrotate.h valuenode_greyed.h valuenode_integer.h \ - valuenode_intstring.h valuenode_join.h valuenode_linear.h valuenode_log.h valuenode_radialcomposite.h \ - valuenode_range.h valuenode_realstring.h valuenode_reciprocal.h valuenode_reference.h \ - valuenode_repeat_gradient.h valuenode_scale.h valuenode_segcalctangent.h valuenode_segcalcvertex.h \ - valuenode_sine.h valuenode_step.h valuenode_stripes.h valuenode_subtract.h valuenode_switch.h \ - valuenode_timedswap.h valuenode_timeloop.h valuenode_timestring.h valuenode_twotone.h \ - valuenode_vectorangle.h valuenode_vectorlength.h valuenode_vectorx.h valuenode_vectory.h + valuenode_add.h \ + valuenode_anglestring.h \ + valuenode_animated.h \ + valuenode_atan2.h \ + valuenode_bline.h \ + valuenode_blinecalctangent.h \ + valuenode_blinecalcvertex.h \ + valuenode_blinecalcwidth.h \ + valuenode_blinereversetangent.h \ + valuenode_composite.h \ + valuenode_const.h \ + valuenode_cos.h \ + valuenode_dotproduct.h \ + valuenode_duplicate.h \ + valuenode_dynamiclist.h \ + valuenode_exp.h \ + valuenode_gradientcolor.h \ + valuenode_gradientrotate.h \ + valuenode_greyed.h \ + valuenode_integer.h \ + valuenode_intstring.h \ + valuenode_join.h \ + valuenode_linear.h \ + valuenode_log.h \ + valuenode_radialcomposite.h \ + valuenode_range.h \ + valuenode_realstring.h \ + valuenode_reciprocal.h \ + valuenode_reference.h \ + valuenode_repeat_gradient.h \ + valuenode_scale.h \ + valuenode_segcalctangent.h \ + valuenode_segcalcvertex.h \ + valuenode_sine.h \ + valuenode_step.h \ + valuenode_stripes.h \ + valuenode_subtract.h \ + valuenode_switch.h \ + valuenode_timedswap.h \ + valuenode_timeloop.h \ + valuenode_timestring.h \ + valuenode_twotone.h \ + valuenode_vectorangle.h \ + valuenode_vectorlength.h \ + valuenode_vectorx.h \ + valuenode_vectory.h + VALUENODESOURCES = \ - valuenode_add.cpp valuenode_anglestring.cpp valuenode_animated.cpp valuenode_atan2.cpp valuenode_bline.cpp \ - valuenode_blinecalctangent.cpp valuenode_blinecalcvertex.cpp valuenode_blinecalcwidth.cpp \ - valuenode_blinereversetangent.cpp valuenode_composite.cpp valuenode_const.cpp valuenode_cos.cpp \ - valuenode_dotproduct.cpp valuenode_duplicate.cpp valuenode_dynamiclist.cpp valuenode_exp.cpp \ - valuenode_gradientcolor.cpp valuenode_gradientrotate.cpp valuenode_greyed.cpp valuenode_integer.cpp \ - valuenode_intstring.cpp valuenode_join.cpp valuenode_linear.cpp valuenode_log.cpp valuenode_radialcomposite.cpp \ - valuenode_range.cpp valuenode_realstring.cpp valuenode_reciprocal.cpp valuenode_reference.cpp \ - valuenode_repeat_gradient.cpp valuenode_scale.cpp valuenode_segcalctangent.cpp valuenode_segcalcvertex.cpp \ - valuenode_sine.cpp valuenode_step.cpp valuenode_stripes.cpp valuenode_subtract.cpp valuenode_switch.cpp \ - valuenode_timedswap.cpp valuenode_timeloop.cpp valuenode_timestring.cpp valuenode_twotone.cpp \ - valuenode_vectorangle.cpp valuenode_vectorlength.cpp valuenode_vectorx.cpp valuenode_vectory.cpp + valuenode_add.cpp \ + valuenode_anglestring.cpp \ + valuenode_animated.cpp \ + valuenode_atan2.cpp \ + valuenode_bline.cpp \ + valuenode_blinecalctangent.cpp \ + valuenode_blinecalcvertex.cpp \ + valuenode_blinecalcwidth.cpp \ + valuenode_blinereversetangent.cpp \ + valuenode_composite.cpp \ + valuenode_const.cpp \ + valuenode_cos.cpp \ + valuenode_dotproduct.cpp \ + valuenode_duplicate.cpp \ + valuenode_dynamiclist.cpp \ + valuenode_exp.cpp \ + valuenode_gradientcolor.cpp \ + valuenode_gradientrotate.cpp \ + valuenode_greyed.cpp \ + valuenode_integer.cpp \ + valuenode_intstring.cpp \ + valuenode_join.cpp \ + valuenode_linear.cpp \ + valuenode_log.cpp \ + valuenode_radialcomposite.cpp \ + valuenode_range.cpp \ + valuenode_realstring.cpp \ + valuenode_reciprocal.cpp \ + valuenode_reference.cpp \ + valuenode_repeat_gradient.cpp \ + valuenode_scale.cpp \ + valuenode_segcalctangent.cpp \ + valuenode_segcalcvertex.cpp \ + valuenode_sine.cpp \ + valuenode_step.cpp \ + valuenode_stripes.cpp \ + valuenode_subtract.cpp \ + valuenode_switch.cpp \ + valuenode_timedswap.cpp \ + valuenode_timeloop.cpp \ + valuenode_timestring.cpp \ + valuenode_twotone.cpp \ + valuenode_vectorangle.cpp \ + valuenode_vectorlength.cpp \ + valuenode_vectorx.cpp \ + valuenode_vectory.cpp + VALUEHEADERS = \ - blinepoint.h gradient.h value.h + blinepoint.h \ + gradient.h \ + value.h + VALUESOURCES = \ - blinepoint.cpp gradient.cpp value.cpp + blinepoint.cpp \ + gradient.cpp \ + value.cpp + SYNFIGHEADERS = \ - angle.h canvasbase.h general.h guidset.h interpolation.h nodebase.h protocol.h quick_rng.h real.h releases.h \ - segment.h smartfile.h string.h string_decl.h surfacenew.h synfig.h types.h vector.h version.h \ - activepoint.h blur.h canvas.h color.h context.h curve_helper.h curveset.h distance.h \ - exception.h gamma.h guid.h importer.h keyframe.h layer.h loadcanvas.h main.h module.h \ - mutex.h node.h palette.h paramdesc.h polynomial_root.h rect.h renddesc.h render.h \ - savecanvas.h surface.h target.h time.h timepointcollect.h transform.h uniqueid.h valuenode.h \ + angle.h \ + canvasbase.h \ + general.h \ + guidset.h \ + interpolation.h \ + nodebase.h \ + protocol.h \ + quick_rng.h \ + real.h \ + releases.h \ + segment.h \ + smartfile.h \ + string.h \ + string_decl.h \ + surfacenew.h \ + synfig.h \ + types.h \ + vector.h \ + version.h \ + activepoint.h \ + blur.h \ + canvas.h \ + color.h \ + context.h \ + curve_helper.h \ + curveset.h \ + distance.h \ + exception.h \ + gamma.h \ + guid.h \ + importer.h \ + keyframe.h \ + layer.h \ + loadcanvas.h \ + main.h \ + module.h \ + mutex.h \ + node.h \ + palette.h \ + paramdesc.h \ + polynomial_root.h \ + rect.h \ + renddesc.h \ + render.h \ + savecanvas.h \ + surface.h \ + target.h \ + time.h \ + timepointcollect.h \ + transform.h \ + uniqueid.h \ + valuenode.h \ waypoint.h + SYNFIGSOURCES = \ - activepoint.cpp blur.cpp canvas.cpp color.cpp context.cpp curve_helper.cpp curveset.cpp distance.cpp \ - exception.cpp gamma.cpp guid.cpp importer.cpp keyframe.cpp layer.cpp loadcanvas.cpp main.cpp module.cpp \ - mutex.cpp node.cpp palette.cpp paramdesc.cpp polynomial_root.cpp rect.cpp renddesc.cpp render.cpp \ - savecanvas.cpp surface.cpp target.cpp time.cpp timepointcollect.cpp transform.cpp uniqueid.cpp valuenode.cpp \ + activepoint.cpp \ + blur.cpp \ + canvas.cpp \ + color.cpp \ + context.cpp \ + curve_helper.cpp \ + curveset.cpp \ + distance.cpp \ + exception.cpp \ + gamma.cpp \ + guid.cpp \ + importer.cpp \ + keyframe.cpp \ + layer.cpp \ + loadcanvas.cpp \ + main.cpp \ + module.cpp \ + mutex.cpp \ + node.cpp \ + palette.cpp \ + paramdesc.cpp \ + polynomial_root.cpp \ + rect.cpp \ + renddesc.cpp \ + render.cpp \ + savecanvas.cpp \ + surface.cpp \ + target.cpp \ + time.cpp \ + timepointcollect.cpp \ + transform.cpp \ + uniqueid.cpp \ + valuenode.cpp \ waypoint.cpp + lib_LTLIBRARIES = libsynfig.la + libsynfig_la_SOURCES = \ - $(VALUEHEADERS) $(VALUESOURCES) $(LAYERSOURCES) $(LAYERHEADERS) $(TARGETHEADERS) $(TARGETSOURCES) \ - $(VALUENODEHEADERS) $(VALUENODESOURCES) $(SYNFIGHEADERS) $(SYNFIGSOURCES) $(IMPORTERHEADERS) $(IMPORTERSOURCES) -libsynfig_la_LIBADD = @LIBLTDL@ @SYNFIG_LIBS@ @LIBADD_DL@ -libsynfig_la_CXXFLAGS = @SYNFIG_CFLAGS@ -DLIBDIR="\"@libdir@\"" -DSYSCONFDIR="\"@sysconfdir@\"" -libsynfig_la_LDFLAGS = -export-dynamic -no-undefined -version-info 0:0:0 + $(VALUEHEADERS) \ + $(VALUESOURCES) \ + $(LAYERSOURCES) \ + $(LAYERHEADERS) \ + $(TARGETHEADERS) \ + $(TARGETSOURCES) \ + $(VALUENODEHEADERS) \ + $(VALUENODESOURCES) \ + $(SYNFIGHEADERS) \ + $(SYNFIGSOURCES) \ + $(IMPORTERHEADERS) \ + $(IMPORTERSOURCES) + +libsynfig_la_LIBADD = \ + @LIBLTDL@ \ + @SYNFIG_LIBS@ \ + @LIBADD_DL@ + +libsynfig_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ \ + -DLIBDIR="\"@libdir@\"" \ + -DSYSCONFDIR="\"@sysconfdir@\"" + +libsynfig_la_LDFLAGS = \ + -export-dynamic \ + -no-undefined \ + -version-info 0:0:0 + + +include_synfigdir = @synfigincludedir@/synfig -include_synfigdir=@synfigincludedir@/synfig include_synfig_HEADERS = \ - $(SYNFIGHEADERS) $(LAYERHEADERS) $(TARGETHEADERS) $(VALUENODEHEADERS) $(IMPORTERHEADERS) $(VALUEHEADERS) + $(SYNFIGHEADERS) \ + $(LAYERHEADERS) \ + $(TARGETHEADERS) \ + $(VALUENODEHEADERS) \ + $(IMPORTERHEADERS) \ + $(VALUEHEADERS) diff --git a/synfig-core/trunk/src/tool/Makefile.am b/synfig-core/trunk/src/tool/Makefile.am index f019d0b..dabe04e 100644 --- a/synfig-core/trunk/src/tool/Makefile.am +++ b/synfig-core/trunk/src/tool/Makefile.am @@ -1,15 +1,27 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -EXTRA_DIST=tool.nsh +MAINTAINERCLEANFILES = \ + Makefile.in -INCLUDES=-I$(top_builddir) -I$(top_srcdir)/src +EXTRA_DIST = \ + tool.nsh -bin_PROGRAMS = synfig +INCLUDES = \ + -I$(top_builddir) \ + -I$(top_srcdir)/src -synfig_SOURCES = main.cpp -synfig_LDADD = ../synfig/libsynfig.la @SYNFIG_LIBS@ @OPENEXR_HALF_LIBS@ -synfig_CXXFLAGS = @SYNFIG_CFLAGS@ -#synfig_LDFLAGS=-export-dynamic -dlopen self -#-dlopen ../modules/example/libexample.la +bin_PROGRAMS = \ + synfig + + +synfig_SOURCES = \ + main.cpp + +synfig_LDADD = \ + ../synfig/libsynfig.la \ + @SYNFIG_LIBS@ \ + @OPENEXR_HALF_LIBS@ + +synfig_CXXFLAGS = \ + @SYNFIG_CFLAGS@ diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index 5d017f6..af7326c 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -1,17 +1,56 @@ # $Id$ -MAINTAINERCLEANFILES=COPYING INSTALL config/ltmain.sh doxygen.cfg config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store +MAINTAINERCLEANFILES = \ + COPYING \ + INSTALL \ + config/ltmain.sh \ + doxygen.cfg \ + config/config.guess \ + config/config.sub \ + config/ltmain.sh \ + config/install-sh \ + config/mkinstalldirs \ + config/aclocal.m4 \ + config/missing \ + config/texinfo.tex \ + config/depcomp \ + aclocal.m4 \ + config.h.in \ + configure \ + stamp-h.in \ + Makefile.in \ + config.log \ + config.status \ + .doc_stamp \ + .DS_Store + +SUBDIRS = \ + build_tools \ + src \ + images \ + po + +EXTRA_DIST = \ + COPYING \ + TODO \ + m4/subs.m4 \ + doxygen.cfg.in \ + doxygen.cfg \ + macosxbuild.sh \ + win32build.sh \ + win32inst.nsi.in \ + config/package \ + config/depcomp \ + m4/cxx_macros.m4 \ + m4/ETL.m4 \ + ChangeLog.old \ + synfigstudio.xml.in \ + synfigstudio-thumbnailer.schemas.in -SUBDIRS=build_tools src images po - -EXTRA_DIST=COPYING TODO m4/subs.m4 doxygen.cfg.in doxygen.cfg macosxbuild.sh win32build.sh win32inst.nsi.in config/package config/depcomp m4/cxx_macros.m4 m4/ETL.m4 ChangeLog.old synfigstudio.xml.in synfigstudio-thumbnailer.schemas.in # Desktop entry -#desktopdir = $(datadir)/gnome/apps/Graphics -desktopdir = $(prefix)/share/applications -desktop_DATA = synfigstudio.desktop -#desktop_in_files = synfigstudio.desktop.in -#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +desktopdir = $(prefix)/share/applications +desktop_DATA = synfigstudio.desktop # @INTLTOOL_DESKTOP_RULE@ @@ -24,7 +63,6 @@ icon_DATA = images/synfig_icon.png images/sif_icon.png ACLOCAL_AMFLAGS=-I m4 -CVS=cvs GREP=grep PRINTF=printf SH=sh @@ -56,12 +94,6 @@ stats: -@du -hcs $(shell find $(top_srcdir)/src -name '*.[ch]*' | $(GREP) -v libavcodec) | $(GREP) total -@echo -#tagstable: -# $(CVS) tag -F stable - -#tagrelease: -# $(CVS) tag -F @PACKAGE_TARNAME@_@VERSION_MAJ@_@VERSION_MIN@_@VERSION_REV@ - listfixmes: -@echo -@echo -- List of pending FIXMEs diff --git a/synfig-studio/trunk/build_tools/Makefile.am b/synfig-studio/trunk/build_tools/Makefile.am index 23a1201..29b053f 100644 --- a/synfig-studio/trunk/build_tools/Makefile.am +++ b/synfig-studio/trunk/build_tools/Makefile.am @@ -1,4 +1,4 @@ -dist_noinst_SCRIPTS=autorevision.sh +dist_noinst_SCRIPTS = autorevision.sh all-local: sh $(srcdir)/autorevision.sh "$(top_srcdir)" "$(top_builddir)" diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am index d15d25d..5b254d1 100644 --- a/synfig-studio/trunk/images/Makefile.am +++ b/synfig-studio/trunk/images/Makefile.am @@ -1,24 +1,179 @@ - -SYNFIG=synfig -EXT=@imageext@ - -EXTRA_DIST=installer_logo.sif installer_logo_osx.sif splash_screen.sifz splash_screen-0.61.08.sif splash_screen-0.61.07.sif about_icon.sif angle_icon.sif bline_icon.sif blinepoint_icon.sif bool_icon.sif canvas_icon.sif canvas_pointer_icon.sif children_icon.sif circle_icon.sif clear_redo_icon.sif clear_undo_icon.sif color_icon.sif curves_icon.sif draw_icon.sif duplicate_icon.sif encapsulate_icon.sif eyedrop_icon.sif fill_icon.sif gradient_icon.sif group_icon.sif info_icon.sif integer_icon.sif keyframe_icon.sif keyframe_lock_icon.sif layer_icon.sif list_icon.sif logo.sif meta_data_icon.sif mirror_icon.sif navigator_icon.sif normal_icon.sif pastecanvas_icon.sif polygon_icon.sif real_icon.sif rectangle_icon.sif rotate_icon.sif saveall_icon.sif scale_icon.sif segment_icon.sif select_all_child_layers_icon.sif sif_icon.sif sketch_icon.sif smooth_move_icon.sif string_icon.sif reset_colors_icon.sif swap_colors_icon.sif synfig_icon.sif synfig_icon.svg time_icon.sif time_track_icon.sif valuenode_icon.sif vector_icon.sif wallpaper.sif width_icon.sif zoom_icon.sif rename_icon.sif plant_icon.sif text_icon.sif polyline_icon.sif star_icon.sif set_bg_color.sif set_fg_color.sif -IMAGES=installer_logo.$(EXT) installer_logo_osx.$(EXT) mirror_icon.$(EXT) time_icon.$(EXT) time_track_icon.$(EXT) curves_icon.$(EXT) pastecanvas_icon.$(EXT) group_icon.$(EXT) clear_redo_icon.$(EXT) clear_undo_icon.$(EXT) navigator_icon.$(EXT) info_icon.$(EXT) zoom_icon.$(EXT) meta_data_icon.$(EXT) children_icon.$(EXT) keyframe_icon.$(EXT) reset_colors_icon.$(EXT) swap_colors_icon.$(EXT) rotate_icon.$(EXT) scale_icon.$(EXT) smooth_move_icon.$(EXT) width_icon.$(EXT) rectangle_icon.$(EXT) circle_icon.$(EXT) draw_icon.$(EXT) sketch_icon.$(EXT) fill_icon.$(EXT) normal_icon.$(EXT) select_all_child_layers_icon.$(EXT) sif_icon.$(EXT) synfig_icon.$(EXT) saveall_icon.$(EXT) bool_icon.$(EXT) integer_icon.$(EXT) angle_icon.$(EXT) segment_icon.$(EXT) blinepoint_icon.$(EXT) list_icon.$(EXT) canvas_pointer_icon.$(EXT) string_icon.$(EXT) eyedrop_icon.$(EXT) about_icon.$(EXT) splash_screen.$(EXT) canvas_icon.$(EXT) vector_icon.$(EXT) real_icon.$(EXT) color_icon.$(EXT) valuenode_icon.$(EXT) polygon_icon.$(EXT) bline_icon.$(EXT) layer_icon.$(EXT) duplicate_icon.$(EXT) encapsulate_icon.$(EXT) gradient_icon.$(EXT) keyframe_lock_all.$(EXT) keyframe_lock_past.$(EXT) keyframe_lock_future.$(EXT) keyframe_lock_none.$(EXT) rename_icon.$(EXT) plant_icon.$(EXT) text_icon.$(EXT) polyline_icon.$(EXT) star_icon.$(EXT) set_bg_color.$(EXT) set_fg_color.$(EXT) - -MAINTAINERCLEANFILES=Makefile.in -CLEANFILES=$(IMAGES) images.nsh unimages.nsh installer_logo.bmp sif_icon.ico synfig_icon.ico icons.nsh unicons.nsh -CLEANDIRS=16x16 22x22 24x24 32x32 48x48 64x64 128x128 - -image_DATA=$(IMAGES) +SYNFIG = synfig + +EXT = @imageext@ + + +EXTRA_DIST = \ + installer_logo.sif \ + installer_logo_osx.sif \ + splash_screen.sifz \ + splash_screen-0.61.08.sif \ + splash_screen-0.61.07.sif \ + about_icon.sif \ + angle_icon.sif \ + bline_icon.sif \ + blinepoint_icon.sif \ + bool_icon.sif \ + canvas_icon.sif \ + canvas_pointer_icon.sif \ + children_icon.sif \ + circle_icon.sif \ + clear_redo_icon.sif \ + clear_undo_icon.sif \ + color_icon.sif \ + curves_icon.sif \ + draw_icon.sif \ + duplicate_icon.sif \ + encapsulate_icon.sif \ + eyedrop_icon.sif \ + fill_icon.sif \ + gradient_icon.sif \ + group_icon.sif \ + info_icon.sif \ + integer_icon.sif \ + keyframe_icon.sif \ + keyframe_lock_icon.sif \ + layer_icon.sif \ + list_icon.sif \ + logo.sif \ + meta_data_icon.sif \ + mirror_icon.sif \ + navigator_icon.sif \ + normal_icon.sif \ + pastecanvas_icon.sif \ + polygon_icon.sif \ + real_icon.sif \ + rectangle_icon.sif \ + rotate_icon.sif \ + saveall_icon.sif \ + scale_icon.sif \ + segment_icon.sif \ + select_all_child_layers_icon.sif \ + sif_icon.sif \ + sketch_icon.sif \ + smooth_move_icon.sif \ + string_icon.sif \ + reset_colors_icon.sif \ + swap_colors_icon.sif \ + synfig_icon.sif \ + synfig_icon.svg \ + time_icon.sif \ + time_track_icon.sif \ + valuenode_icon.sif \ + vector_icon.sif \ + wallpaper.sif \ + width_icon.sif \ + zoom_icon.sif \ + rename_icon.sif \ + plant_icon.sif \ + text_icon.sif \ + polyline_icon.sif \ + star_icon.sif \ + set_bg_color.sif \ + set_fg_color.sif + + +IMAGES = \ + installer_logo.$(EXT) \ + installer_logo_osx.$(EXT) \ + mirror_icon.$(EXT) \ + time_icon.$(EXT) \ + time_track_icon.$(EXT) \ + curves_icon.$(EXT) \ + pastecanvas_icon.$(EXT) \ + group_icon.$(EXT) \ + clear_redo_icon.$(EXT) \ + clear_undo_icon.$(EXT) \ + navigator_icon.$(EXT) \ + info_icon.$(EXT) \ + zoom_icon.$(EXT) \ + meta_data_icon.$(EXT) \ + children_icon.$(EXT) \ + keyframe_icon.$(EXT) \ + reset_colors_icon.$(EXT) \ + swap_colors_icon.$(EXT) \ + rotate_icon.$(EXT) \ + scale_icon.$(EXT) \ + smooth_move_icon.$(EXT) \ + width_icon.$(EXT) \ + rectangle_icon.$(EXT) \ + circle_icon.$(EXT) \ + draw_icon.$(EXT) \ + sketch_icon.$(EXT) \ + fill_icon.$(EXT) \ + normal_icon.$(EXT) \ + select_all_child_layers_icon.$(EXT) \ + sif_icon.$(EXT) \ + synfig_icon.$(EXT) \ + saveall_icon.$(EXT) \ + bool_icon.$(EXT) \ + integer_icon.$(EXT) \ + angle_icon.$(EXT) \ + segment_icon.$(EXT) \ + blinepoint_icon.$(EXT) \ + list_icon.$(EXT) \ + canvas_pointer_icon.$(EXT) \ + string_icon.$(EXT) \ + eyedrop_icon.$(EXT) \ + about_icon.$(EXT) \ + splash_screen.$(EXT) \ + canvas_icon.$(EXT) \ + vector_icon.$(EXT) \ + real_icon.$(EXT) \ + color_icon.$(EXT) \ + valuenode_icon.$(EXT) \ + polygon_icon.$(EXT) \ + bline_icon.$(EXT) \ + layer_icon.$(EXT) \ + duplicate_icon.$(EXT) \ + encapsulate_icon.$(EXT) \ + gradient_icon.$(EXT) \ + keyframe_lock_all.$(EXT) \ + keyframe_lock_past.$(EXT) \ + keyframe_lock_future.$(EXT) \ + keyframe_lock_none.$(EXT) \ + rename_icon.$(EXT) \ + plant_icon.$(EXT) \ + text_icon.$(EXT) \ + polyline_icon.$(EXT) \ + star_icon.$(EXT) \ + set_bg_color.$(EXT) \ + set_fg_color.$(EXT) + + +MAINTAINERCLEANFILES = \ + Makefile.in + + +CLEANFILES = \ + $(IMAGES) \ + images.nsh \ + unimages.nsh \ + installer_logo.bmp \ + sif_icon.ico \ + synfig_icon.ico \ + icons.nsh \ + unicons.nsh + +CLEANDIRS = \ + 16x16 \ + 22x22 \ + 24x24 \ + 32x32 \ + 48x48 \ + 64x64 \ + 128x128 + +image_DATA = $(IMAGES) all: $(IMAGES) -SUFFIXES=.sif .tif .png +SUFFIXES = .sif .tif .png #.SUFFIXES: $(SUFFIXES) -PNGTOICO=png2ico +PNGTOICO = png2ico .sif.ico: $(SYNFIG) $< -w 16 -h 16 -o $*-16x16.png $< -w 32 -h 32 -o $*-32x32.png $< -w 48 -h 48 -o $*-48x48.png $< -w 64 -h 64 -o $*-64x64.png @@ -64,29 +219,6 @@ keyframe_lock_none.$(EXT): $(srcdir)/keyframe_lock_icon.sif echo " File \"images\\$@\"" >>./images.nsh echo " Delete \"\$$INSTDIR\\share\\pixmaps\\$@\"" >>./unimages.nsh -#.sif.png: -# $(SYNFIG) -q $< -o $@ --time 0 - -#datanode_icon.$(EXT): datanode_icon.sif -# $(SYNFIG) -q datanode_icon.sif -o datanode_icon.$(EXT) -w 128 -h 128 --time 0 - -#color_icon.$(EXT): color_icon.sif -# $(SYNFIG) -q color_icon.sif -o color_icon.$(EXT) -w 128 -h 128 --time 0 - -#real_icon.$(EXT): real_icon.sif -# $(SYNFIG) -q real_icon.sif -o real_icon.$(EXT) -w 128 -h 128 --time 0 - -#vector_icon.$(EXT): vector_icon.sif -# $(SYNFIG) -q vector_icon.sif -o vector_icon.$(EXT) -w 128 -h 128 --time 0 - -#splash_screen.$(EXT): splash_screen.sif -# $(SYNFIG) -q splash_screen.sif -o splash_screen.$(EXT) --time 0 - -#about_icon.$(EXT): about_icon.sif -# $(SYNFIG) -q about_icon.sif -o about_icon.$(EXT) -w 128 -h 128 --time 0 - -#canvas_icon.$(EXT): canvas_icon.sif -# $(SYNFIG) -q canvas_icon.sif -o canvas_icon.$(EXT) -w 128 -h 128 --time 0 if !WIN32_PKG if !MACOSX_PKG diff --git a/synfig-studio/trunk/src/Makefile.am b/synfig-studio/trunk/src/Makefile.am index f4111e8..adc00c2 100644 --- a/synfig-studio/trunk/src/Makefile.am +++ b/synfig-studio/trunk/src/Makefile.am @@ -1,20 +1,11 @@ # $Id$ -MAINTAINERCLEANFILES=Makefile.in -EXTRA_DIST=template.cpp template.h +MAINTAINERCLEANFILES = Makefile.in -SUBDIRS=synfigapp gtkmm +EXTRA_DIST = \ + template.cpp \ + template.h -#if WINDOWSYS_GTKMM -#WINDOWSYS_LIBS=$(top_builddir)/src/gtkmm/libwindowsys.a @GTKMM_LIBS@ -#SUBDIRS=synfigapp gtkmm -#else -#WINDOWSYS_LIBS=$(top_builddir)/src/win32/libwindowsys.a @WIN32_LIBS@ -#SUBDIRS=win32 -#endif - -#bin_PROGRAMS = synfigstudio -#synfigstudio_SOURCES = main.cpp app.cpp app.h instance.cpp instance.h actions.cpp actions.h toolbox.cpp toolbox.h compview.cpp compview.h canvasview.cpp canvasview.h workarea.cpp workarea.h canvasproperties.cpp canvasproperties.h -# view.h view.cpp workarea.cpp workarea.h toolbox.cpp toolbox.h trackview.cpp trackview.h actions.cpp actions.h compview.cpp compview.h -#synfigstudio_LDADD = @SYNFIG_LIBS@ $(WINDOWSYS_LIBS) -#synfigstudio_LDFLAGS=-dlopen self +SUBDIRS = \ + synfigapp \ + gtkmm diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am index 4eb2186..9c3ba34 100644 --- a/synfig-studio/trunk/src/gtkmm/Makefile.am +++ b/synfig-studio/trunk/src/gtkmm/Makefile.am @@ -1,111 +1,376 @@ # $Id$ -EXTRA_DIST = compview.cpp -MAINTAINERCLEANFILES = Makefile.in $(GLADE_FILES) +EXTRA_DIST = \ + compview.cpp + +MAINTAINERCLEANFILES = \ + Makefile.in + CELLRENDERER_HH = \ - cellrenderer_gradient.h cellrenderer_time.h cellrenderer_timetrack.h cellrenderer_value.h + cellrenderer_gradient.h \ + cellrenderer_time.h \ + cellrenderer_timetrack.h \ + cellrenderer_value.h + CELLRENDERER_CC = \ - cellrenderer_gradient.cpp cellrenderer_time.cpp cellrenderer_timetrack.cpp cellrenderer_value.cpp + cellrenderer_gradient.cpp \ + cellrenderer_time.cpp \ + cellrenderer_timetrack.cpp \ + cellrenderer_value.cpp + WORKAREARENDERER_HH = \ - renderer_bbox.h renderer_canvas.h renderer_dragbox.h renderer_ducks.h renderer_grid.h \ - renderer_guides.h renderer_timecode.h workarearenderer.h + renderer_bbox.h \ + renderer_canvas.h \ + renderer_dragbox.h \ + renderer_ducks.h \ + renderer_grid.h \ + renderer_guides.h \ + renderer_timecode.h \ + workarearenderer.h + WORKAREARENDERER_CC = \ - renderer_bbox.cpp renderer_canvas.cpp renderer_dragbox.cpp renderer_ducks.cpp renderer_grid.cpp \ - renderer_guides.cpp renderer_timecode.cpp workarearenderer.cpp + renderer_bbox.cpp \ + renderer_canvas.cpp \ + renderer_dragbox.cpp \ + renderer_ducks.cpp \ + renderer_grid.cpp \ + renderer_guides.cpp \ + renderer_timecode.cpp \ + workarearenderer.cpp + PALETTE_HH = \ - mod_palette/dock_palbrowse.h mod_palette/dock_paledit.h mod_palette/mod_palette.h + mod_palette/dock_palbrowse.h \ + mod_palette/dock_paledit.h \ + mod_palette/mod_palette.h + PALETTE_CC = \ - mod_palette/dock_palbrowse.cpp mod_palette/dock_paledit.cpp mod_palette/mod_palette.cpp + mod_palette/dock_palbrowse.cpp \ + mod_palette/dock_paledit.cpp \ + mod_palette/mod_palette.cpp + MOD_MIRROR_HH = \ - mod_mirror/mod_mirror.h mod_mirror/state_mirror.h + mod_mirror/mod_mirror.h \ + mod_mirror/state_mirror.h + MOD_MIRROR_CC = \ - mod_mirror/mod_mirror.cpp mod_mirror/state_mirror.cpp + mod_mirror/mod_mirror.cpp \ + mod_mirror/state_mirror.cpp + DIALOG_HH = \ - dialog_color.h dialog_gradient.h dialog_keyframe.h dialog_preview.h dialog_setup.h \ - dialog_soundselect.h dialog_waypoint.h + dialog_color.h \ + dialog_gradient.h \ + dialog_keyframe.h \ + dialog_preview.h \ + dialog_setup.h \ + dialog_soundselect.h \ + dialog_waypoint.h + DIALOG_CC = \ - dialog_color.cpp dialog_gradient.cpp dialog_keyframe.cpp dialog_preview.cpp dialog_setup.cpp \ - dialog_soundselect.cpp dialog_waypoint.cpp + dialog_color.cpp \ + dialog_gradient.cpp \ + dialog_keyframe.cpp \ + dialog_preview.cpp \ + dialog_setup.cpp \ + dialog_soundselect.cpp \ + dialog_waypoint.cpp + DOCK_HH = \ - dialog_tooloptions.h dock_canvases.h dock_canvasspecific.h dock_children.h dock_curves.h \ - dock_history.h dock_info.h dock_keyframes.h dock_layergroups.h dock_layers.h dock_metadata.h \ - dock_navigator.h dock_params.h dock_timetrack.h dockable.h dockbook.h dockdialog.h dockmanager.h + dialog_tooloptions.h \ + dock_canvases.h \ + dock_canvasspecific.h \ + dock_children.h \ + dock_curves.h \ + dock_history.h \ + dock_info.h \ + dock_keyframes.h \ + dock_layergroups.h \ + dock_layers.h \ + dock_metadata.h \ + dock_navigator.h \ + dock_params.h \ + dock_timetrack.h \ + dockable.h \ + dockbook.h \ + dockdialog.h \ + dockmanager.h + DOCK_CC = \ - dialog_tooloptions.cpp dock_canvases.cpp dock_canvasspecific.cpp dock_children.cpp dock_curves.cpp \ - dock_history.cpp dock_info.cpp dock_keyframes.cpp dock_layergroups.cpp dock_layers.cpp dock_metadata.cpp \ - dock_navigator.cpp dock_params.cpp dock_timetrack.cpp dockable.cpp dockbook.cpp dockdialog.cpp dockmanager.cpp + dialog_tooloptions.cpp \ + dock_canvases.cpp \ + dock_canvasspecific.cpp \ + dock_children.cpp \ + dock_curves.cpp \ + dock_history.cpp \ + dock_info.cpp \ + dock_keyframes.cpp \ + dock_layergroups.cpp \ + dock_layers.cpp \ + dock_metadata.cpp \ + dock_navigator.cpp \ + dock_params.cpp \ + dock_timetrack.cpp \ + dockable.cpp \ + dockbook.cpp \ + dockdialog.cpp \ + dockmanager.cpp + WIDGET_HH = \ - widget_canvaschooser.h widget_color.h widget_coloredit.h widget_compselect.h widget_curves.h \ - widget_defaults.h widget_distance.h widget_enum.h widget_filename.h widget_gradient.h \ - widget_sound.h widget_time.h widget_timeslider.h widget_value.h widget_vector.h widget_waypoint.h \ + widget_canvaschooser.h \ + widget_color.h \ + widget_coloredit.h \ + widget_compselect.h \ + widget_curves.h \ + widget_defaults.h \ + widget_distance.h \ + widget_enum.h \ + widget_filename.h \ + widget_gradient.h \ + widget_sound.h \ + widget_time.h \ + widget_timeslider.h \ + widget_value.h \ + widget_vector.h \ + widget_waypoint.h \ widget_waypointmodel.h + WIDGET_CC = \ - widget_canvaschooser.cpp widget_color.cpp widget_coloredit.cpp widget_compselect.cpp widget_curves.cpp \ - widget_defaults.cpp widget_distance.cpp widget_enum.cpp widget_filename.cpp widget_gradient.cpp \ - widget_sound.cpp widget_time.cpp widget_timeslider.cpp widget_value.cpp widget_vector.cpp widget_waypoint.cpp \ + widget_canvaschooser.cpp \ + widget_color.cpp \ + widget_coloredit.cpp \ + widget_compselect.cpp \ + widget_curves.cpp \ + widget_defaults.cpp \ + widget_distance.cpp \ + widget_enum.cpp \ + widget_filename.cpp \ + widget_gradient.cpp \ + widget_sound.cpp \ + widget_time.cpp \ + widget_timeslider.cpp \ + widget_value.cpp \ + widget_vector.cpp \ + widget_waypoint.cpp \ widget_waypointmodel.cpp + STATE_HH = \ - state_bline.h state_circle.h state_draw.h state_eyedrop.h state_fill.h state_gradient.h \ - state_normal.h state_polygon.h state_rectangle.h state_rotate.h state_scale.h state_sketch.h \ - state_smoothmove.h state_star.h state_stroke.h state_text.h state_width.h state_zoom.h + state_bline.h \ + state_circle.h \ + state_draw.h \ + state_eyedrop.h \ + state_fill.h \ + state_gradient.h \ + state_normal.h \ + state_polygon.h \ + state_rectangle.h \ + state_rotate.h \ + state_scale.h \ + state_sketch.h \ + state_smoothmove.h \ + state_star.h \ + state_stroke.h \ + state_text.h \ + state_width.h \ + state_zoom.h + STATE_CC = \ - state_bline.cpp state_circle.cpp state_draw.cpp state_eyedrop.cpp state_fill.cpp state_gradient.cpp \ - state_normal.cpp state_polygon.cpp state_rectangle.cpp state_rotate.cpp state_scale.cpp state_sketch.cpp \ - state_smoothmove.cpp state_star.cpp state_stroke.cpp state_text.cpp state_width.cpp state_zoom.cpp + state_bline.cpp \ + state_circle.cpp \ + state_draw.cpp \ + state_eyedrop.cpp \ + state_fill.cpp \ + state_gradient.cpp \ + state_normal.cpp \ + state_polygon.cpp \ + state_rectangle.cpp \ + state_rotate.cpp \ + state_scale.cpp \ + state_sketch.cpp \ + state_smoothmove.cpp \ + state_star.cpp \ + state_stroke.cpp \ + state_text.cpp \ + state_width.cpp \ + state_zoom.cpp + TREEVIEW_HH = \ - childrentree.h keyframetree.h layergrouptree.h layertree.h + childrentree.h \ + keyframetree.h \ + layergrouptree.h \ + layertree.h + TREEVIEW_CC = \ - childrentree.cpp keyframetree.cpp layergrouptree.cpp layertree.cpp + childrentree.cpp \ + keyframetree.cpp \ + layergrouptree.cpp \ + layertree.cpp + TREESTORE_HH = \ - canvastreestore.h childrentreestore.h historytreestore.h keyframetreestore.h layergrouptreestore.h \ - layerparamtreestore.h layertreestore.h metadatatreestore.h + canvastreestore.h \ + childrentreestore.h \ + historytreestore.h \ + keyframetreestore.h \ + layergrouptreestore.h \ + layerparamtreestore.h \ + layertreestore.h \ + metadatatreestore.h + TREESTORE_CC = \ - canvastreestore.cpp childrentreestore.cpp historytreestore.cpp keyframetreestore.cpp layergrouptreestore.cpp \ - layerparamtreestore.cpp layertreestore.cpp metadatatreestore.cpp + canvastreestore.cpp \ + childrentreestore.cpp \ + historytreestore.cpp \ + keyframetreestore.cpp \ + layergrouptreestore.cpp \ + layerparamtreestore.cpp \ + layertreestore.cpp \ + metadatatreestore.cpp -DUCKTRANSFORM_HH = ducktransform_rotate.h ducktransform_scale.h ducktransform_translate.h \ + +DUCKTRANSFORM_HH = \ + ducktransform_rotate.h \ + ducktransform_scale.h \ + ducktransform_translate.h \ duck.h + DUCKTRANSFORM_CC = \ duck.cpp -EVENTS_HH = event_layerclick.h event_mouse.h + +EVENTS_HH = \ + event_layerclick.h \ + event_mouse.h + ACTION_MANAGERS_HH = \ - groupactionmanager.h keyframeactionmanager.h layeractionmanager.h + groupactionmanager.h \ + keyframeactionmanager.h \ + layeractionmanager.h + ACTION_MANAGERS_CC = \ - groupactionmanager.cpp keyframeactionmanager.cpp layeractionmanager.cpp + groupactionmanager.cpp \ + keyframeactionmanager.cpp \ + layeractionmanager.cpp + + +OTHER_HH = \ + compview.h \ + eventkey.h \ + smach.h \ + about.h \ + adjust_window.h \ + app.h \ + asyncrenderer.h \ + audiocontainer.h \ + autorecover.h \ + canvasoptions.h \ + canvasproperties.h \ + canvasview.h \ + devicetracker.h \ + dialogsettings.h \ + duckmatic.h \ + general.h \ + iconcontroller.h \ + instance.h \ + ipc.h \ + keymapsettings.h \ + module.h \ + onemoment.h \ + preview.h \ + renddesc.h \ + render.h \ + splash.h \ + statemanager.h \ + toolbox.h \ + valuelink.h \ + workarea.h \ + zoomdial.h + +OTHER_CC = \ + main.cpp \ + about.cpp \ + adjust_window.cpp \ + app.cpp \ + asyncrenderer.cpp \ + audiocontainer.cpp \ + autorecover.cpp \ + canvasoptions.cpp \ + canvasproperties.cpp \ + canvasview.cpp \ + devicetracker.cpp \ + dialogsettings.cpp \ + duckmatic.cpp \ + iconcontroller.cpp \ + instance.cpp \ + ipc.cpp \ + keymapsettings.cpp \ + module.cpp \ + onemoment.cpp \ + preview.cpp \ + renddesc.cpp \ + render.cpp \ + splash.cpp \ + statemanager.cpp \ + toolbox.cpp \ + valuelink.cpp \ + workarea.cpp \ + zoomdial.cpp -OTHER_HH = compview.h eventkey.h smach.h \ - about.h adjust_window.h app.h asyncrenderer.h audiocontainer.h autorecover.h canvasoptions.h \ - canvasproperties.h canvasview.h devicetracker.h dialogsettings.h duckmatic.h general.h \ - iconcontroller.h instance.h ipc.h keymapsettings.h module.h onemoment.h preview.h renddesc.h \ - render.h splash.h statemanager.h toolbox.h valuelink.h workarea.h zoomdial.h -OTHER_CC = main.cpp \ - about.cpp adjust_window.cpp app.cpp asyncrenderer.cpp audiocontainer.cpp autorecover.cpp canvasoptions.cpp \ - canvasproperties.cpp canvasview.cpp devicetracker.cpp dialogsettings.cpp duckmatic.cpp iconcontroller.cpp \ - instance.cpp ipc.cpp keymapsettings.cpp module.cpp onemoment.cpp preview.cpp renddesc.cpp render.cpp \ - splash.cpp statemanager.cpp toolbox.cpp valuelink.cpp workarea.cpp zoomdial.cpp -INCLUDES = -I$(top_srcdir)/src +INCLUDES = \ + -I$(top_srcdir)/src bin_PROGRAMS = synfigstudio + synfigstudio_SOURCES = \ - $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) \ - $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) \ - $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) \ - $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(CELLRENDERER_HH) $(CELLRENDERER_CC) \ - $(DIALOG_HH) $(DIALOG_CC) - -synfigstudio_LDADD = ../synfigapp/libsynfigapp.la @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@ -synfigstudio_LDFLAGS = -dlopen self -synfigstudio_CXXFLAGS = @SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(imagedir)\" -DIMAGE_EXT=\"$(imageext)\" "-DLOCALEDIR=\"$(localedir)\"" + $(MOD_MIRROR_CC) \ + $(MOD_MIRROR_HH) \ + $(PALETTE_CC) \ + $(PALETTE_HH) \ + $(WORKAREARENDERER_CC) \ + $(WORKAREARENDERER_HH) \ + $(ACTION_MANAGERS_HH) \ + $(ACTION_MANAGERS_CC) \ + $(DOCK_HH) \ + $(DOCK_CC) \ + $(OTHER_HH) \ + $(OTHER_CC) \ + $(EVENTS_HH) \ + $(DUCKTRANSFORM_HH) \ + $(DUCKTRANSFORM_CC) \ + $(TREEVIEW_HH) \ + $(TREEVIEW_CC) \ + $(TREESTORE_HH) \ + $(TREESTORE_CC) \ + $(STATE_CC) \ + $(STATE_HH) \ + $(WIDGET_CC) \ + $(WIDGET_HH) \ + $(CELLRENDERER_HH) \ + $(CELLRENDERER_CC) \ + $(DIALOG_HH) \ + $(DIALOG_CC) + +synfigstudio_LDADD = \ + ../synfigapp/libsynfigapp.la \ + @SYNFIG_LIBS@ \ + @GTKMM_LIBS@ \ + @FMOD_LIBS@ + +synfigstudio_LDFLAGS = \ + -dlopen self + +synfigstudio_CXXFLAGS = \ + @SYNFIG_CFLAGS@ \ + @GTKMM_CFLAGS@ \ + -DIMAGE_DIR=\"$(imagedir)\" \ + -DIMAGE_EXT=\"$(imageext)\" \ + "-DLOCALEDIR=\"$(localedir)\"" diff --git a/synfig-studio/trunk/src/synfigapp/Makefile.am b/synfig-studio/trunk/src/synfigapp/Makefile.am index eb8506c..887205e 100644 --- a/synfig-studio/trunk/src/synfigapp/Makefile.am +++ b/synfig-studio/trunk/src/synfigapp/Makefile.am @@ -1,108 +1,286 @@ # $Id$ -MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl +MAINTAINERCLEANFILES = \ + Makefile.in + +INCLUDES = \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/libltdl LAYER_ACTION_HH = \ - actions/layeractivate.h actions/layeradd.h actions/layerduplicate.h actions/layerencapsulate.h \ - actions/layerlower.h actions/layermove.h actions/layerparamconnect.h actions/layerparamdisconnect.h \ - actions/layerparamset.h actions/layerraise.h actions/layerremove.h actions/layersetdesc.h + actions/layeractivate.h \ + actions/layeradd.h \ + actions/layerduplicate.h \ + actions/layerencapsulate.h \ + actions/layerlower.h \ + actions/layermove.h \ + actions/layerparamconnect.h \ + actions/layerparamdisconnect.h \ + actions/layerparamset.h \ + actions/layerraise.h \ + actions/layerremove.h \ + actions/layersetdesc.h + LAYER_ACTION_CC = \ - actions/layeractivate.cpp actions/layeradd.cpp actions/layerduplicate.cpp actions/layerencapsulate.cpp \ - actions/layerlower.cpp actions/layermove.cpp actions/layerparamconnect.cpp actions/layerparamdisconnect.cpp \ - actions/layerparamset.cpp actions/layerraise.cpp actions/layerremove.cpp actions/layersetdesc.cpp + actions/layeractivate.cpp \ + actions/layeradd.cpp \ + actions/layerduplicate.cpp \ + actions/layerencapsulate.cpp \ + actions/layerlower.cpp \ + actions/layermove.cpp \ + actions/layerparamconnect.cpp \ + actions/layerparamdisconnect.cpp \ + actions/layerparamset.cpp \ + actions/layerraise.cpp \ + actions/layerremove.cpp \ + actions/layersetdesc.cpp + VALUEDESC_ACTION_HH = \ - actions/valuedescconnect.h actions/valuedescconvert.h actions/valuedescdisconnect.h \ - actions/valuedescexport.h actions/valuedesclink.h actions/valuedescblinelink.h actions/valuedescset.h + actions/valuedescconnect.h \ + actions/valuedescconvert.h \ + actions/valuedescdisconnect.h \ + actions/valuedescexport.h \ + actions/valuedesclink.h \ + actions/valuedescblinelink.h \ + actions/valuedescset.h + VALUEDESC_ACTION_CC = \ - actions/valuedescconnect.cpp actions/valuedescconvert.cpp actions/valuedescdisconnect.cpp \ - actions/valuedescexport.cpp actions/valuedesclink.cpp actions/valuedescblinelink.cpp actions/valuedescset.cpp + actions/valuedescconnect.cpp \ + actions/valuedescconvert.cpp \ + actions/valuedescdisconnect.cpp \ + actions/valuedescexport.cpp \ + actions/valuedesclink.cpp \ + actions/valuedescblinelink.cpp \ + actions/valuedescset.cpp + VALUENODE_ACTION_HH = \ - actions/valuenodeadd.h actions/valuenodeconstset.h actions/valuenodedynamiclistinsert.h \ - actions/valuenodedynamiclistinsertsmart.h actions/valuenodedynamiclistloop.h \ - actions/valuenodedynamiclistremove.h actions/valuenodedynamiclistremovesmart.h \ - actions/valuenodedynamiclistrotateorder.h actions/valuenodedynamiclistunloop.h \ - actions/valuenodelinkconnect.h actions/valuenodelinkdisconnect.h actions/valuenoderemove.h \ - actions/valuenoderename.h actions/valuenodereplace.h + actions/valuenodeadd.h \ + actions/valuenodeconstset.h \ + actions/valuenodedynamiclistinsert.h \ + actions/valuenodedynamiclistinsertsmart.h \ + actions/valuenodedynamiclistloop.h \ + actions/valuenodedynamiclistremove.h \ + actions/valuenodedynamiclistremovesmart.h \ + actions/valuenodedynamiclistrotateorder.h \ + actions/valuenodedynamiclistunloop.h \ + actions/valuenodelinkconnect.h \ + actions/valuenodelinkdisconnect.h \ + actions/valuenoderemove.h \ + actions/valuenoderename.h \ + actions/valuenodereplace.h + VALUENODE_ACTION_CC = \ - actions/valuenodeadd.cpp actions/valuenodeconstset.cpp actions/valuenodedynamiclistinsert.cpp \ - actions/valuenodedynamiclistinsertsmart.cpp actions/valuenodedynamiclistloop.cpp \ - actions/valuenodedynamiclistremove.cpp actions/valuenodedynamiclistremovesmart.cpp \ - actions/valuenodedynamiclistrotateorder.cpp actions/valuenodedynamiclistunloop.cpp \ - actions/valuenodelinkconnect.cpp actions/valuenodelinkdisconnect.cpp actions/valuenoderemove.cpp \ - actions/valuenoderename.cpp actions/valuenodereplace.cpp + actions/valuenodeadd.cpp \ + actions/valuenodeconstset.cpp \ + actions/valuenodedynamiclistinsert.cpp \ + actions/valuenodedynamiclistinsertsmart.cpp \ + actions/valuenodedynamiclistloop.cpp \ + actions/valuenodedynamiclistremove.cpp \ + actions/valuenodedynamiclistremovesmart.cpp \ + actions/valuenodedynamiclistrotateorder.cpp \ + actions/valuenodedynamiclistunloop.cpp \ + actions/valuenodelinkconnect.cpp \ + actions/valuenodelinkdisconnect.cpp \ + actions/valuenoderemove.cpp \ + actions/valuenoderename.cpp \ + actions/valuenodereplace.cpp + WAYPOINT_ACTION_HH = \ - actions/waypointadd.h actions/waypointremove.h actions/waypointset.h actions/waypointsetsmart.h \ - actions/waypointsimpleadd.h actions/waypointconnect.h actions/waypointdisconnect.h + actions/waypointadd.h \ + actions/waypointremove.h \ + actions/waypointset.h \ + actions/waypointsetsmart.h \ + actions/waypointsimpleadd.h \ + actions/waypointconnect.h \ + actions/waypointdisconnect.h + WAYPOINT_ACTION_CC = \ - actions/waypointadd.cpp actions/waypointremove.cpp actions/waypointset.cpp actions/waypointsetsmart.cpp \ - actions/waypointsimpleadd.cpp actions/waypointconnect.cpp actions/waypointdisconnect.cpp + actions/waypointadd.cpp \ + actions/waypointremove.cpp \ + actions/waypointset.cpp \ + actions/waypointsetsmart.cpp \ + actions/waypointsimpleadd.cpp \ + actions/waypointconnect.cpp \ + actions/waypointdisconnect.cpp + TIMEPOINT_ACTION_HH = \ - actions/timepointscopy.h actions/timepointsdelete.h actions/timepointsmove.h timegather.h + actions/timepointscopy.h \ + actions/timepointsdelete.h \ + actions/timepointsmove.h \ + timegather.h + TIMEPOINT_ACTION_CC = \ - actions/timepointscopy.cpp actions/timepointsdelete.cpp actions/timepointsmove.cpp timegather.cpp + actions/timepointscopy.cpp \ + actions/timepointsdelete.cpp \ + actions/timepointsmove.cpp \ + timegather.cpp + ACTIVEPOINT_ACTION_HH = \ - actions/activepointadd.h actions/activepointremove.h actions/activepointset.h \ - actions/activepointsetoff.h actions/activepointseton.h actions/activepointsetsmart.h \ + actions/activepointadd.h \ + actions/activepointremove.h \ + actions/activepointset.h \ + actions/activepointsetoff.h \ + actions/activepointseton.h \ + actions/activepointsetsmart.h \ actions/activepointsimpleadd.h + ACTIVEPOINT_ACTION_CC = \ - actions/activepointadd.cpp actions/activepointremove.cpp actions/activepointset.cpp \ - actions/activepointsetoff.cpp actions/activepointseton.cpp actions/activepointsetsmart.cpp \ + actions/activepointadd.cpp \ + actions/activepointremove.cpp \ + actions/activepointset.cpp \ + actions/activepointsetoff.cpp \ + actions/activepointseton.cpp \ + actions/activepointsetsmart.cpp \ actions/activepointsimpleadd.cpp + KEYFRAME_ACTION_HH = \ - actions/keyframeadd.h actions/keyframeduplicate.h actions/keyframeremove.h actions/keyframeset.h \ - actions/keyframesetdelta.h actions/keyframewaypointset.h + actions/keyframeadd.h \ + actions/keyframeduplicate.h \ + actions/keyframeremove.h \ + actions/keyframeset.h \ + actions/keyframesetdelta.h \ + actions/keyframewaypointset.h + KEYFRAME_ACTION_CC = \ - actions/keyframeadd.cpp actions/keyframeduplicate.cpp actions/keyframeremove.cpp actions/keyframeset.cpp \ - actions/keyframesetdelta.cpp actions/keyframewaypointset.cpp + actions/keyframeadd.cpp \ + actions/keyframeduplicate.cpp \ + actions/keyframeremove.cpp \ + actions/keyframeset.cpp \ + actions/keyframesetdelta.cpp \ + actions/keyframewaypointset.cpp + CANVAS_ACTION_HH = \ - actions/canvasadd.h actions/canvasdescriptionset.h actions/canvasidset.h actions/canvasnameset.h \ - actions/canvasremove.h actions/canvasrenddescset.h + actions/canvasadd.h \ + actions/canvasdescriptionset.h \ + actions/canvasidset.h \ + actions/canvasnameset.h \ + actions/canvasremove.h \ + actions/canvasrenddescset.h + CANVAS_ACTION_CC = \ - actions/canvasadd.cpp actions/canvasdescriptionset.cpp actions/canvasidset.cpp actions/canvasnameset.cpp \ - actions/canvasremove.cpp actions/canvasrenddescset.cpp + actions/canvasadd.cpp \ + actions/canvasdescriptionset.cpp \ + actions/canvasidset.cpp \ + actions/canvasnameset.cpp \ + actions/canvasremove.cpp \ + actions/canvasrenddescset.cpp + GROUP_ACTION_HH = \ - actions/groupaddlayers.h actions/groupremove.h actions/groupremovelayers.h actions/grouprename.h + actions/groupaddlayers.h \ + actions/groupremove.h \ + actions/groupremovelayers.h \ + actions/grouprename.h + GROUP_ACTION_CC = \ - actions/groupaddlayers.cpp actions/groupremove.cpp actions/groupremovelayers.cpp actions/grouprename.cpp + actions/groupaddlayers.cpp \ + actions/groupremove.cpp \ + actions/groupremovelayers.cpp \ + actions/grouprename.cpp + OTHER_ACTION_HH = \ - actions/blinepointtangentmerge.h actions/blinepointtangentsplit.h actions/colorset.h \ - actions/editmodeset.h actions/gradientset.h + actions/blinepointtangentmerge.h \ + actions/blinepointtangentsplit.h \ + actions/colorset.h \ + actions/editmodeset.h \ + actions/gradientset.h + OTHER_ACTION_CC = \ - actions/blinepointtangentmerge.cpp actions/blinepointtangentsplit.cpp actions/colorset.cpp \ - actions/editmodeset.cpp actions/gradientset.cpp + actions/blinepointtangentmerge.cpp \ + actions/blinepointtangentsplit.cpp \ + actions/colorset.cpp \ + actions/editmodeset.cpp \ + actions/gradientset.cpp + ACTIONHH = \ - $(ACTIVEPOINT_ACTION_HH) $(CANVAS_ACTION_HH) $(GROUP_ACTION_HH) $(KEYFRAME_ACTION_HH) $(LAYER_ACTION_HH) \ - $(OTHER_ACTION_HH) $(TIMEPOINT_ACTION_HH) $(VALUEDESC_ACTION_HH) $(VALUENODE_ACTION_HH) $(WAYPOINT_ACTION_HH) + $(ACTIVEPOINT_ACTION_HH) \ + $(CANVAS_ACTION_HH) \ + $(GROUP_ACTION_HH) \ + $(KEYFRAME_ACTION_HH) \ + $(LAYER_ACTION_HH) \ + $(OTHER_ACTION_HH) \ + $(TIMEPOINT_ACTION_HH) \ + $(VALUEDESC_ACTION_HH) \ + $(VALUENODE_ACTION_HH) \ + $(WAYPOINT_ACTION_HH) + ACTIONCC = \ - $(ACTIVEPOINT_ACTION_CC) $(CANVAS_ACTION_CC) $(GROUP_ACTION_CC) $(KEYFRAME_ACTION_CC) $(LAYER_ACTION_CC) \ - $(OTHER_ACTION_CC) $(TIMEPOINT_ACTION_CC) $(VALUEDESC_ACTION_CC) $(VALUENODE_ACTION_CC) $(WAYPOINT_ACTION_CC) + $(ACTIVEPOINT_ACTION_CC) \ + $(CANVAS_ACTION_CC) \ + $(GROUP_ACTION_CC) \ + $(KEYFRAME_ACTION_CC) \ + $(LAYER_ACTION_CC) \ + $(OTHER_ACTION_CC) \ + $(TIMEPOINT_ACTION_CC) \ + $(VALUEDESC_ACTION_CC) \ + $(VALUENODE_ACTION_CC) \ + $(WAYPOINT_ACTION_CC) + SYNFIGAPPHH = \ - editmode.h selectionmanager.h \ - $(ACTIONHH) action.h action_param.h action_system.h blineconvert.h canvasinterface.h cvs.h \ - inputdevice.h instance.h main.h settings.h uimanager.h value_desc.h general.h + editmode.h \ + selectionmanager.h \ + $(ACTIONHH) \ + action.h \ + action_param.h \ + action_system.h \ + blineconvert.h \ + canvasinterface.h \ + cvs.h \ + inputdevice.h \ + instance.h \ + main.h \ + settings.h \ + uimanager.h \ + value_desc.h \ + general.h + SYNFIGAPPCC = \ - $(ACTIONCC) action.cpp action_param.cpp action_system.cpp blineconvert.cpp canvasinterface.cpp cvs.cpp \ - inputdevice.cpp instance.cpp main.cpp settings.cpp uimanager.cpp value_desc.cpp + $(ACTIONCC) \ + action.cpp \ + action_param.cpp \ + action_system.cpp \ + blineconvert.cpp \ + canvasinterface.cpp \ + cvs.cpp \ + inputdevice.cpp \ + instance.cpp \ + main.cpp \ + settings.cpp \ + uimanager.cpp \ + value_desc.cpp + synfiglibdir = @synfiglibdir@ lib_LTLIBRARIES = libsynfigapp.la -libsynfigapp_la_SOURCES = $(SYNFIGAPPCC) $(SYNFIGAPPHH) -libsynfigapp_la_LIBADD = @SYNFIG_LIBS@ -libsynfigapp_la_CXXFLAGS = @SYNFIG_CFLAGS@ "-DLOCALEDIR=\"$(localedir)\"" -libsynfigapp_la_LDFLAGS = -export-dynamic -no-undefined + +libsynfigapp_la_SOURCES = \ + $(SYNFIGAPPCC) \ + $(SYNFIGAPPHH) + +libsynfigapp_la_LIBADD = \ + @SYNFIG_LIBS@ + +libsynfigapp_la_CXXFLAGS = \ + @SYNFIG_CFLAGS@ \ + "-DLOCALEDIR=\"$(localedir)\"" + +libsynfigapp_la_LDFLAGS = \ + -export-dynamic \ + -no-undefined + include_synfigappdir = $(prefix)/include/synfigapp-0.0/synfigapp -include_synfigapp_HEADERS = $(SYNFIGAPPHH) + +include_synfigapp_HEADERS = \ + $(SYNFIGAPPHH) -- 2.7.4