diff --git a/src/Makefile_insert b/src/Makefile_insert
index 4bef3dc5634734af4c314931eb15b33b8bf17017..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
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 = \
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 \
- filters/libfilters.a \
- widgets/libspwidgets.a \
- display/libspdisplay.a \
- helper/libspchelp.a \
- libcroco/libcroco.a \
- libnrtype/libnrtype.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 \
- libnr/libnr.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_src_includes = \
- $(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)/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