X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FMakefile.am;h=8cbbbf21b0c36b08f0e788fab602e00fde15edd9;hb=2b242284dc5b7099759e66b34281fc90ac2f423c;hp=cb6e1b9030d58814cbcf340241b73d287b198ec4;hpb=2ebfcf72203f94f579931a9cfe6658a65ca5027d;p=inkscape.git diff --git a/src/Makefile.am b/src/Makefile.am index cb6e1b903..8cbbbf21b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,9 +16,9 @@ bin_PROGRAMS = inkscape inkview # Libraries which should be compiled by "make" but not installed. # Use this only for libraries that are really standalone, rather than for # source tree subdirectories. -if WITH_INKBOARD -libpedro = pedro/libpedro.a -endif +#if WITH_INKBOARD +#libpedro = pedro/libpedro.a +#endif noinst_LIBRARIES = \ libinkscape.a \ dom/libdom.a \ @@ -45,6 +45,7 @@ all_libs = \ $(PYTHON_LIBS) \ $(INKBOARD_LIBS) \ $(LIBWPG_LIBS) \ + $(DBUS_LIBS) \ $(IMAGEMAGICK_LIBS) # Add sources common for Inkscape and Inkview to this variable. @@ -53,6 +54,10 @@ ink_common_sources = inkscape_SOURCES = # Add Inkview-only sources here. inkview_SOURCES = +# Add sources that are built from meta files +BUILT_SOURCES = +# Extra files to distribute +EXTRA_DIST = INCLUDES = \ $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ @@ -62,6 +67,7 @@ INCLUDES = \ $(IMAGEMAGICK_CFLAGS) \ $(INKBOARD_CFLAGS) \ $(LIBWPG_CFLAGS) \ + $(DBUS_CFLAGS) \ $(XFT_CFLAGS) \ $(LCMS_CFLAGS) \ $(POPPLER_CFLAGS) \ @@ -72,6 +78,7 @@ INCLUDES = \ $(WIN32_CFLAGS) \ -I$(srcdir)/bind/javainc \ -I$(srcdir)/bind/javainc/linux \ + -I$(builddir)/extension/dbus \ $(AM_CPPFLAGS) CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl @@ -88,7 +95,8 @@ CXXTEST_TESTSUITES = if PLATFORM_WIN32 win32_sources = winmain.cpp registrytool.cpp registrytool.h -win32ldflags = -lcomdlg32 +win32ldflags = -lcomdlg32 -lmscms +mwindows = -mwindows endif if INKJAR @@ -104,15 +112,15 @@ include dialogs/Makefile_insert include display/Makefile_insert include dom/Makefile_insert include extension/Makefile_insert +include extension/dbus/Makefile_insert include extension/implementation/Makefile_insert include extension/internal/Makefile_insert include extension/script/Makefile_insert include filters/Makefile_insert include helper/Makefile_insert -include inkjar/Makefile_insert include io/Makefile_insert -include pedro/Makefile_insert -include jabber_whiteboard/Makefile_insert +#include pedro/Makefile_insert +#include jabber_whiteboard/Makefile_insert include libcroco/Makefile_insert include libgdl/Makefile_insert include libnr/Makefile_insert @@ -123,17 +131,14 @@ include live_effects/Makefile_insert include live_effects/parameter/Makefile_insert include libvpsc/Makefile_insert include libcola/Makefile_insert -include removeoverlap/Makefile_insert -include graphlayout/Makefile_insert include svg/Makefile_insert include widgets/Makefile_insert include debug/Makefile_insert include xml/Makefile_insert -include traits/Makefile_insert -include algorithms/Makefile_insert include ui/Makefile_insert include ui/cache/Makefile_insert include ui/dialog/Makefile_insert +include ui/tool/Makefile_insert include ui/view/Makefile_insert include ui/widget/Makefile_insert include util/Makefile_insert @@ -141,10 +146,10 @@ include trace/Makefile_insert include 2geom/Makefile_insert # Extra files not mentioned as sources to include in the source tarball -EXTRA_DIST = \ +EXTRA_DIST += \ $(top_srcdir)/Doxyfile \ sp-skeleton.cpp sp-skeleton.h \ - algorithms/makefile.in \ + util/makefile.in \ application/makefile.in \ bind/makefile.in \ debug/makefile.in \ @@ -157,7 +162,6 @@ EXTRA_DIST = \ extension/script/makefile.in \ filters/makefile.in \ helper/makefile.in \ - inkjar/makefile.in \ io/makefile.in \ io/crystalegg.xml \ io/doc2html.xsl \ @@ -171,10 +175,8 @@ EXTRA_DIST = \ livarot/makefile.in \ live_effects/makefile.in \ live_effects/parameter/makefile.in \ - removeoverlap/makefile.in \ svg/makefile.in \ trace/makefile.in \ - traits/makefile.in \ ui/makefile.in \ ui/cache/makefile.in \ ui/dialog/makefile.in \ @@ -191,11 +193,10 @@ EXTRA_DIST = \ extension/internal/emf-win32-print.cpp \ extension/internal/emf-win32-print.h \ helper/sp-marshal.list \ - traits/copy.h \ - traits/function.h \ - traits/list-copy.h \ - traits/reference.h \ - $(jabber_whiteboard_SOURCES) + show-preview.bmp \ + winconsole.cpp \ + $(jabber_whiteboard_SOURCES) \ + $(CXXTEST_TEMPLATE) # Extra files to remove when doing "make distclean" DISTCLEANFILES = \ @@ -212,10 +213,11 @@ libinkscape_a_SOURCES = $(ink_common_sources) inkscape_SOURCES += main.cpp $(win32_sources) inkscape_LDADD = $(all_libs) -inkscape_LDFLAGS = --export-dynamic $(kdeldflags) +inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) inkview_SOURCES += inkview.cpp $(win32_sources) inkview_LDADD = $(all_libs) +inkview_LDFLAGS = $(mwindows) # ################################################ # VERSION REPORTING @@ -223,21 +225,19 @@ inkview_LDADD = $(all_libs) libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h -if USE_SVN_VERSION -inkscape_version_deps = $(top_srcdir)/.svn/entries +if USE_BZR_VERSION +inkscape_version_deps = $(top_srcdir)/.bzr/branch/last-revision endif -# If this is an SVN snapshot build, regenerate this file every time -# someone updates the SVN working directory. +# If this is an BZR snapshot build, regenerate this file every time +# someone updates the BZR working directory. inkscape-version.cpp: $(inkscape_version_deps) - VER_PREFIX="$(VERSION)"; \ - if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \ - VER_SVNREV=" r`LANG=en svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \ - if test ! -z "`svn status -q $(srcdir)`"; then \ - VER_CUSTOM=" custom"; \ - fi; \ + VER_PREFIX="$(VERSION)";\ + VER_BZRREV=" r`bzr revno`"; \ + if test ! -z "`bzr status -S -V $(srcdir)`"; then \ + VER_CUSTOM=" custom"; \ fi; \ - VERSION="$$VER_PREFIX$$VER_SVNREV$$VER_CUSTOM"; \ + VERSION="$$VER_PREFIX$$VER_BZRREV$$VER_CUSTOM"; \ echo "namespace Inkscape { " \ "char const *version_string = \"$$VERSION\"; " \ "}" > inkscape-version.new.cpp; \ @@ -264,10 +264,11 @@ check_PROGRAMS = cxxtests # List of all tests to be run. TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests +XFAIL_TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests # including the the testsuites here ensures that they get distributed -cxxtests_SOURCES = cxxtests.cpp $(CXXTEST_TESTSUITES) -cxxtests_LDADD = libnr/nr-compose-reference.o $(all_libs) +cxxtests_SOURCES = cxxtests.cpp libnr/nr-compose-reference.cpp $(CXXTEST_TESTSUITES) +cxxtests_LDADD = $(all_libs) cxxtests.cpp: $(CXXTEST_TESTSUITES) $(CXXTEST_TEMPLATE) $(CXXTESTGEN) -o cxxtests.cpp $(CXXTEST_TESTSUITES)