diff --git a/src/Makefile.am b/src/Makefile.am
index 90b0be28c1ee9f5070a12eb0c6f716e6e7a97eed..0c585d6a9de38a2f9d5815be5755a2cec4319eb4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
# 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.
# 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 \
noinst_LIBRARIES = \
libinkscape.a \
dom/libdom.a \
inkscape_SOURCES =
# Add Inkview-only sources here.
inkview_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) \
INCLUDES = \
$(PERL_CFLAGS) $(PYTHON_CFLAGS) \
$(WIN32_CFLAGS) \
-I$(srcdir)/bind/javainc \
-I$(srcdir)/bind/javainc/linux \
$(WIN32_CFLAGS) \
-I$(srcdir)/bind/javainc \
-I$(srcdir)/bind/javainc/linux \
+ -I$(builddir)/extension/dbus \
$(AM_CPPFLAGS)
CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
$(AM_CPPFLAGS)
CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl
if PLATFORM_WIN32
win32_sources = winmain.cpp registrytool.cpp registrytool.h
if PLATFORM_WIN32
win32_sources = winmain.cpp registrytool.cpp registrytool.h
-win32ldflags = -lcomdlg32
+win32ldflags = -lcomdlg32 -lmscms
+mwindows = -mwindows
endif
if INKJAR
endif
if INKJAR
# Include all partial makefiles from subdirectories
include Makefile_insert
# Include all partial makefiles from subdirectories
include Makefile_insert
-include application/Makefile_insert
include bind/Makefile_insert
include dialogs/Makefile_insert
include display/Makefile_insert
include bind/Makefile_insert
include dialogs/Makefile_insert
include display/Makefile_insert
include extension/script/Makefile_insert
include filters/Makefile_insert
include helper/Makefile_insert
include extension/script/Makefile_insert
include filters/Makefile_insert
include helper/Makefile_insert
-include inkjar/Makefile_insert
include io/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
include libcroco/Makefile_insert
include libgdl/Makefile_insert
include libnr/Makefile_insert
include live_effects/parameter/Makefile_insert
include libvpsc/Makefile_insert
include libcola/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 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/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
include ui/view/Makefile_insert
include ui/widget/Makefile_insert
include util/Makefile_insert
include 2geom/Makefile_insert
# Extra files not mentioned as sources to include in the source tarball
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 \
$(top_srcdir)/Doxyfile \
sp-skeleton.cpp sp-skeleton.h \
- algorithms/makefile.in \
+ util/makefile.in \
application/makefile.in \
bind/makefile.in \
debug/makefile.in \
application/makefile.in \
bind/makefile.in \
debug/makefile.in \
extension/script/makefile.in \
filters/makefile.in \
helper/makefile.in \
extension/script/makefile.in \
filters/makefile.in \
helper/makefile.in \
- inkjar/makefile.in \
io/makefile.in \
io/crystalegg.xml \
io/doc2html.xsl \
io/makefile.in \
io/crystalegg.xml \
io/doc2html.xsl \
livarot/makefile.in \
live_effects/makefile.in \
live_effects/parameter/makefile.in \
livarot/makefile.in \
live_effects/makefile.in \
live_effects/parameter/makefile.in \
- removeoverlap/makefile.in \
svg/makefile.in \
trace/makefile.in \
svg/makefile.in \
trace/makefile.in \
- traits/makefile.in \
ui/makefile.in \
ui/cache/makefile.in \
ui/dialog/makefile.in \
ui/makefile.in \
ui/cache/makefile.in \
ui/dialog/makefile.in \
extension/internal/emf-win32-print.cpp \
extension/internal/emf-win32-print.h \
helper/sp-marshal.list \
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 \
+ show-preview.bmp \
+ winconsole.cpp \
$(jabber_whiteboard_SOURCES) \
$(CXXTEST_TEMPLATE)
$(jabber_whiteboard_SOURCES) \
$(CXXTEST_TEMPLATE)
inkscape_SOURCES += main.cpp $(win32_sources)
inkscape_LDADD = $(all_libs)
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_SOURCES += inkview.cpp $(win32_sources)
inkview_LDADD = $(all_libs)
+inkview_LDFLAGS = $(mwindows)
# ################################################
# VERSION REPORTING
# ################################################
# VERSION REPORTING
libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h
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
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)
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; \
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; \
echo "namespace Inkscape { " \
"char const *version_string = \"$$VERSION\"; " \
"}" > inkscape-version.new.cpp; \
# List of all tests to be run.
TESTS = $(check_PROGRAMS) ../share/extensions/test/run-all-extension-tests
# 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
# 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)
cxxtests.cpp: $(CXXTEST_TESTSUITES) $(CXXTEST_TEMPLATE)
$(CXXTESTGEN) -o cxxtests.cpp $(CXXTEST_TESTSUITES)