![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/Makefile_insert b/src/Makefile_insert
index 7863225743f794c55a07d04c9c70260e6fb46a07..43a6295d65421eb01c69e9688d7722cc5da10a89 100644 (file)
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
## Makefile.am fragment, included by src/Makefile.am.
-# ################################################
-#
-# E X T R A
-#
-# ################################################
-
-if PLATFORM_WIN32
-win32_sources = winmain.cpp registrytool.cpp registrytool.h
-win32ldflags = -lcomdlg32
-endif
-
-if INKJAR
-inkjar_dir = inkjar
-inkjar_libs = inkjar/libinkjar.a
-endif
-
-
# ################################################
#
# I N K S C A P E
filter-chemistry.cpp filter-chemistry.h \
filter-enums.cpp filter-enums.h \
flood-context.cpp flood-context.h \
- fontsize-expansion.cpp fontsize-expansion.h \
forward.h \
gradient-context.cpp gradient-context.h \
gradient-drag.cpp gradient-drag.h \
help.cpp help.h \
helper-fns.h \
icon-size.h \
+ id-clash.cpp id-clash.h \
ige-mac-menu.h ige-mac-menu.c \
inkscape-stock.cpp inkscape-stock.h\
inkscape.cpp inkscape.h inkscape-private.h \
interface.cpp interface.h \
- isnan.h isinf.h \
+ isinf.h \
isnormal.h \
knot-enums.h \
knot-holder-entity.h knot-holder-entity.cpp \
layer-fns.cpp layer-fns.h \
layer-manager.cpp layer-manager.h \
line-geometry.cpp line-geometry.h \
+ lpe-tool-context.cpp lpe-tool-context.h \
macros.h \
main-cmdlineact.cpp main-cmdlineact.h \
media.cpp media.h \
menus-skeleton.h \
prefix.cpp \
prefix.h \
- prefs-utils.cpp \
- prefs-utils.h \
print.cpp print.h \
profile-manager.cpp \
profile-manager.h \
shape-editor.cpp shape-editor.h \
shortcuts.cpp shortcuts.h \
snap.cpp snap.h \
+ snap-preferences.cpp snap-preferences.h \
+ snapped-curve.cpp snapped-curve.h \
snapped-line.cpp snapped-line.h \
snapped-point.cpp snapped-point.h \
snapper.cpp snapper.h \
sp-conn-end.cpp sp-conn-end.h \
sp-cursor.cpp sp-cursor.h \
sp-defs.cpp sp-defs.h \
+ sp-desc.cpp sp-desc.h \
sp-ellipse.cpp sp-ellipse.h \
- sp-feblend.cpp sp-feblend.h \
- sp-feblend-fns.h \
- sp-fecolormatrix.cpp sp-fecolormatrix.h \
- sp-fecolormatrix-fns.h \
- sp-fecomponenttransfer.cpp sp-fecomponenttransfer.h \
- sp-fecomponenttransfer-funcnode.cpp sp-fecomponenttransfer-funcnode.h \
- sp-fecomponenttransfer-fns.h \
- sp-fecomposite.cpp sp-fecomposite.h \
- sp-fecomposite-fns.h \
- sp-feconvolvematrix.cpp sp-feconvolvematrix.h \
- sp-feconvolvematrix-fns.h \
- sp-fediffuselighting.cpp sp-fediffuselighting.h \
- sp-fediffuselighting-fns.h \
- sp-fedisplacementmap.cpp sp-fedisplacementmap.h \
- sp-fedisplacementmap-fns.h \
- sp-fedistantlight.cpp sp-fedistantlight.h \
- sp-feflood.cpp sp-feflood.h \
- sp-feflood-fns.h \
- sp-feimage.cpp sp-feimage.h \
- sp-feimage-fns.h \
- sp-femerge.cpp sp-femerge.h \
- sp-femerge-fns.h \
- sp-femergenode.cpp sp-femergenode.h \
- sp-femorphology.cpp sp-femorphology.h \
- sp-femorphology-fns.h \
- sp-feoffset.cpp sp-feoffset.h \
- sp-feoffset-fns.h \
- sp-fepointlight.cpp sp-fepointlight.h \
- sp-fespecularlighting.cpp sp-fespecularlighting.h \
- sp-fespecularlighting-fns.h \
- sp-fespotlight.cpp sp-fespotlight.h \
- sp-fetile.cpp sp-fetile.h \
- sp-fetile-fns.h \
- sp-feturbulence.cpp sp-feturbulence.h \
- sp-feturbulence-fns.h \
sp-filter-fns.h \
sp-filter-primitive.cpp \
sp-filter-primitive.h \
sp-radial-gradient.h \
sp-rect.cpp sp-rect.h \
sp-root.cpp sp-root.h \
+ sp-script.cpp sp-script.h \
sp-shape.cpp sp-shape.h \
sp-spiral.cpp sp-spiral.h \
sp-star.cpp sp-star.h \
sp-switch.cpp sp-switch.h\
sp-text.cpp sp-text.h \
sp-textpath.h \
+ sp-title.cpp sp-title.h \
sp-tref-reference.cpp sp-tref-reference.h \
sp-tref.cpp sp-tref.h \
sp-tspan.cpp sp-tspan.h \
spiral-context.cpp spiral-context.h \
splivarot.cpp splivarot.h \
star-context.cpp star-context.h \
- streams-gzip.h streams-gzip.cpp \
- streams-handles.h streams-handles.cpp \
- streams-jar.h streams-jar.cpp \
- streams-zlib.h streams-zlib.cpp \
style.cpp style.h \
sp-style-elem.cpp sp-style-elem.h \
svg-profile.h \
version.cpp version.h \
zoom-context.cpp zoom-context.h
-
-# Force libinkpost.a to be rebuilt if we add files to libinkpost_a_SOURCES.
-libinkpost_a_DEPENDENCIES = Makefile_insert
-
# libinkpost.a: Any object file that needs to be near the end of the link line.
# gradient-chemistry.o is called by some things in display/.
libinkpost_a_SOURCES = \
gc-finalized.h gc-finalized.cpp \
gc-managed.h \
gc-soft-ptr.h \
+ gc-allocator.h \
gc.cpp \
gradient-chemistry.cpp gradient-chemistry.h \
ink-action.cpp \
helper/pixbuf-ops.cpp \
helper/pixbuf-ops.h
-inkscape_private_libs = \
- libinkpre.a \
- application/libinkapp.a \
- ui/dialog/libuidialog.a \
- dialogs/libspdialogs.a \
- ui/cache/libuicache.a \
- jabber_whiteboard/libjabber_whiteboard.a \
- pedro/libpedro.a \
- trace/libtrace.a \
- svg/libspsvg.a \
- widgets/libspwidgets.a \
- display/libspdisplay.a \
- helper/libspchelp.a \
- libcroco/libcroco.a \
- libnrtype/libnrtype.a \
- libnr/libnr.a \
- libavoid/libavoid.a \
- livarot/libvarot.a \
- live_effects/liblive_effects.a \
- live_effects/parameter/liblpeparam.a \
- ui/view/libuiview.a \
- ui/libui.a \
- ui/widget/libuiwidget.a \
- libgdl/libgdl.a \
- graphlayout/libgraphlayout.a \
- removeoverlap/libremoveoverlap.a \
- libcola/libcola.a \
- libvpsc/libvpsc.a \
- extension/libextension.a \
- extension/implementation/libimplementation.a \
- extension/internal/libinternal.a \
- extension/script/libscript.a \
- bind/libbind.a \
- dom/libdom.a \
- xml/libspxml.a \
- 2geom/lib2geom.a \
- util/libinkutil.a \
- io/libio.a \
- $(inkjar_libs) \
- libinkpost.a \
- debug/libinkdebug.a
-
-all_libs = \
- $(inkscape_private_libs) \
- $(INKSCAPE_LIBS) \
- $(GNOME_VFS_LIBS) \
- $(XFT_LIBS) \
- $(FREETYPE_LIBS) \
- $(kdeldadd) \
- $(win32ldflags) \
- $(CARBON_LDFLAGS) \
- $(PERL_LIBS) \
- $(PYTHON_LIBS) \
- $(INKBOARD_LIBS) \
- $(LIBWPG_LIBS) \
- $(IMAGEMAGICK_LIBS)
+# Additional dependencies
desktop.$(OBJEXT): helper/sp-marshal.h
-document.$(OBJEXT): helper/sp-marshal.h inkscape_version.h
-extension/internal/latex-pstricks.$(OBJEXT): inkscape_version.h
-extension/internal/ps.$(OBJEXT): inkscape_version.h
-inkscape.$(OBJEXT): helper/sp-marshal.h inkscape_version.h
+document.$(OBJEXT): helper/sp-marshal.h
+inkscape.$(OBJEXT): helper/sp-marshal.h
knot.$(OBJEXT): helper/sp-marshal.h
-main.$(OBJEXT): inkscape_version.h
selection.$(OBJEXT): helper/sp-marshal.h
sp-object.$(OBJEXT): helper/sp-marshal.h
-sp-root.$(OBJEXT): inkscape_version.h
view.$(OBJEXT): helper/sp-marshal.h
-help.$(OBJEXT): inkscape_version.h
# ################################################
inkview_SOURCES = inkview.cpp $(win32_sources)
inkview_LDADD = $(all_libs)
-style_test_SOURCES = style-test.cpp
-style_test_LDADD = $(all_libs)
+libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h
-inkscape_version.h: ../configure.ac
- echo '#define INKSCAPE_VERSION "$(VERSION)"' > inkscape_version.h
+# Hack: make inkscape-version.cpp a phony target.
+# Create the version file every time "make" is invoked. Overwrite it only
+# if it changes. Watch the backslashes!
+inkscape-version.cpp:
+ VER_PREFIX="$(VERSION)"; \
+ if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \
+ VER_SVNREV=" r`svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \
+ if test ! -z "`svn status -q $(srcdir)`"; then \
+ VER_CUSTOM=" custom"; \
+ fi; \
+ fi; \
+ VERSION="$$VER_PREFIX$$VER_SVNREV$$VER_CUSTOM"; \
+ echo "namespace Inkscape { " \
+ "char const *version_string = \"$$VERSION\"; " \
+ "}" > inkscape-version.new.cpp; \
+ if cmp -s inkscape-version.new.cpp inkscape-version.cpp; then \
+ rm inkscape-version.new.cpp; \
+ else \
+ mv inkscape-version.new.cpp inkscape-version.cpp; \
+ fi; \
+ echo $$VERSION
+.PHONY: inkscape-version.cpp
-test_all_includes = \
- $(srcdir)/attributes-test.h \
- $(srcdir)/color-profile-test.h \
- $(srcdir)/MultiPrinter.h \
- $(srcdir)/TRPIFormatter.h \
- $(srcdir)/PylogFormatter.h \
- $(srcdir)/dir-util-test.h \
- $(srcdir)/extract-uri-test.h \
- $(srcdir)/mod360-test.h \
- $(srcdir)/round-test.h \
- $(srcdir)/sp-gradient-test.h \
- $(srcdir)/sp-style-elem-test.h \
- $(srcdir)/style-test.h \
- $(srcdir)/test-helpers.h \
- $(srcdir)/verbs-test.h
+# ######################
+# ### CxxTest stuff ####
+# ######################
+CXXTEST_TESTSUITES += \
+ $(srcdir)/MultiPrinter.h \
+ $(srcdir)/TRPIFormatter.h \
+ $(srcdir)/PylogFormatter.h \
+ $(srcdir)/attributes-test.h \
+ $(srcdir)/color-profile-test.h \
+ $(srcdir)/dir-util-test.h \
+ $(srcdir)/extract-uri-test.h \
+ $(srcdir)/mod360-test.h \
+ $(srcdir)/round-test.h \
+ $(srcdir)/preferences-test.h \
+ $(srcdir)/sp-gradient-test.h \
+ $(srcdir)/sp-style-elem-test.h \
+ $(srcdir)/style-test.h \
+ $(srcdir)/test-helpers.h \
+ $(srcdir)/verbs-test.h