X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile_insert;h=43a6295d65421eb01c69e9688d7722cc5da10a89;hb=c4b828ca1807524249c2793e18be249cf2a7660d;hp=fec782544d394d65f5d4b88cf364fea0ddd2845e;hpb=e7eb632a79283c0b7f36036594b166e2d8c0fe06;p=inkscape.git

diff --git a/src/Makefile_insert b/src/Makefile_insert
index fec782544..43a6295d6 100644
--- a/src/Makefile_insert
+++ b/src/Makefile_insert
@@ -1,23 +1,6 @@
 ## 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
@@ -40,11 +23,16 @@ libinkpre_a_SOURCES =	\
 	approx-equal.h remove-last.h	\
 	arc-context.cpp arc-context.h	\
 	attributes.cpp attributes.h	\
+	axis-manip.cpp axis-manip.h	\
 	bad-uri-exception.h	\
+	box3d.cpp box3d.h \
+	box3d-context.cpp box3d-context.h \
+	box3d-side.cpp box3d-side.h \
 	brokenimage.xpm	\
 	color-rgba.h	\
 	color-profile.cpp color-profile.h	\
 	color-profile-fns.h	\
+	common-context.cpp common-context.h\
 	conditions.cpp conditions.h\
 	conn-avoid-ref.cpp conn-avoid-ref.h	\
 	connector-context.cpp connector-context.h	\
@@ -56,41 +44,49 @@ libinkpre_a_SOURCES =	\
 	desktop-handles.cpp desktop-handles.h	\
 	desktop-style.cpp desktop-style.h	\
 	desktop.cpp desktop.h	\
+	device-manager.cpp	\
+	device-manager.h	\
 	document-undo.cpp	\
 	document.cpp document.h document-private.h	\
 	document-subset.cpp document-subset.h	\
-        doxygen-main.cpp \
+	doxygen-main.cpp \
 	draw-anchor.cpp	\
 	draw-anchor.h	\
 	draw-context.cpp draw-context.h	\
 	dropper-context.cpp dropper-context.h	\
 	dyna-draw-context.cpp dyna-draw-context.h	\
 	enums.h	\
+	eraser-context.cpp eraser-context.h	\
 	event-context.cpp event-context.h	\
-	event-log.cpp event-log.h       \
+	event-log.cpp event-log.h event.h      \
 	extract-uri.cpp extract-uri.h	\
 	file.cpp file.h	\
 	filter-chemistry.cpp filter-chemistry.h \
-	fontsize-expansion.cpp fontsize-expansion.h	\
+	filter-enums.cpp filter-enums.h \
+	flood-context.cpp flood-context.h	\
 	forward.h	\
-	geom.cpp geom.h	\
-	gnuc-attribute.h	\
 	gradient-context.cpp gradient-context.h \
 	gradient-drag.cpp gradient-drag.h \
 	help.cpp help.h	\
-        icon-size.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 \
+	isnormal.h \
 	knot-enums.h	\
-	knot-holder-entity.h	\
+	knot-holder-entity.h knot-holder-entity.cpp	\
 	knot.cpp knot.h	\
 	knotholder.cpp knotholder.h	\
 	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	\
-	marker-status.cpp marker-status.h	\
+	main-cmdlineact.cpp main-cmdlineact.h \
 	media.cpp media.h	\
 	message-context.cpp message-context.h \
 	message-stack.cpp message-stack.h \
@@ -109,14 +105,18 @@ libinkpre_a_SOURCES =	\
 	pen-context.h	\
 	pencil-context.cpp	\
 	pencil-context.h	\
+	persp3d.cpp persp3d.h	\
+	persp3d-reference.cpp persp3d-reference.h	\
+	perspective-line.cpp perspective-line.h	\
 	preferences.cpp preferences.h \
 	preferences-skeleton.h	\
 	menus-skeleton.h	\
 	prefix.cpp	\
 	prefix.h	\
-	prefs-utils.cpp	\
-	prefs-utils.h	\
 	print.cpp print.h	\
+	profile-manager.cpp	\
+	profile-manager.h	\
+	proj_pt.cpp proj_pt.h	\
 	rect-context.cpp rect-context.h	\
 	require-config.h \
 	rubberband.cpp rubberband.h	\
@@ -128,13 +128,17 @@ libinkpre_a_SOURCES =	\
 	selection.cpp selection.h	\
 	seltrans-handles.cpp seltrans-handles.h	\
 	seltrans.cpp seltrans.h	\
+	shape-editor.cpp shape-editor.h \
 	shortcuts.cpp shortcuts.h	\
-	slideshow.cpp slideshow.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 \
+	syseq.h \
+	transf_mat_3x4.cpp transf_mat_3x4.h	\
 	line-snapper.cpp line-snapper.h \
-	grid-snapper.cpp grid-snapper.h \
 	guide-snapper.cpp guide-snapper.h \
 	object-snapper.cpp object-snapper.h \
 	sp-anchor.cpp sp-anchor.h	\
@@ -143,47 +147,23 @@ libinkpre_a_SOURCES =	\
 	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-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-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-femorphology.cpp sp-femorphology.h	\
-	sp-femorphology-fns.h	\
-	sp-feoffset.cpp sp-feoffset.h	\
-	sp-feoffset-fns.h	\
-	sp-fespecularlighting.cpp sp-fespecularlighting.h	\
-	sp-fespecularlighting-fns.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-filter-reference.cpp	\
 	sp-filter-reference.h	\
 	sp-filter-units.h	\
-	sp-filter.cpp sp-filter.h	\
+	sp-filter.cpp sp-filter.h number-opt-number.h	\
 	sp-flowdiv.h sp-flowdiv.cpp \
 	sp-flowregion.h sp-flowregion.cpp \
 	sp-flowtext.h sp-flowtext.cpp \
+        sp-font.cpp sp-font.h \
+        sp-font-face.cpp sp-font-face.h \
+        sp-glyph.cpp sp-glyph.h \
+        sp-missing-glyph.cpp sp-missing-glyph.h \
+        sp-glyph-kerning.cpp sp-glyph-kerning.h \
 	sp-gaussian-blur.cpp sp-gaussian-blur.h	\
 	sp-gaussian-blur-fns.h	\
 	sp-gradient-fns.h	\
@@ -206,8 +186,9 @@ libinkpre_a_SOURCES =	\
 	sp-line.cpp sp-line.h	\
 	sp-linear-gradient-fns.h	\
 	sp-linear-gradient.h	\
+	sp-lpe-item.cpp sp-lpe-item.h	\
 	sp-marker-loc.h	\
-	sp-marker.cpp sp-marker.h	\
+	marker.cpp marker.h	\
 	sp-mask.cpp sp-mask.h	\
 	sp-metadata.cpp sp-metadata.h	\
 	sp-metric.h	\
@@ -226,6 +207,7 @@ libinkpre_a_SOURCES =	\
 	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	\
@@ -236,16 +218,15 @@ libinkpre_a_SOURCES =	\
 	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	\
 	sp-use-reference.cpp sp-use-reference.h	\
 	sp-use.cpp sp-use.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 \
@@ -256,14 +237,14 @@ libinkpre_a_SOURCES =	\
 	text-editing.cpp text-editing.h	\
 	text-tag-attributes.h	\
 	tools-switch.cpp tools-switch.h\
+	tweak-context.h tweak-context.cpp \
+	unicoderange.cpp unicoderange.h \
 	uri-references.cpp uri-references.h	\
+	vanishing-point.cpp vanishing-point.h	\
 	verbs.cpp verbs.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 =	\
@@ -272,8 +253,15 @@ libinkpost_a_SOURCES =	\
 	dir-util.cpp dir-util.h	\
 	ege-adjustment-action.cpp	\
 	ege-adjustment-action.h	\
+	ege-color-prof-tracker.cpp	\
+	ege-color-prof-tracker.h	\
+	ege-output-action.cpp	\
+	ege-output-action.h	\
+	ege-select-one-action.cpp	\
+	ege-select-one-action.h	\
 	fill-or-stroke.h	\
 	filter-chemistry.cpp filter-chemistry.h \
+	filter-enums.cpp filter-enums.h \
 	fixes.cpp \
 	gc-alloc.h	\
 	gc-anchored.h gc-anchored.cpp	\
@@ -281,6 +269,7 @@ 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	\
@@ -293,71 +282,19 @@ libinkpost_a_SOURCES =	\
 	composite-undo-stack-observer.cpp \
 	undo-stack-observer.h \
 	unit-constants.h	\
-	uri.cpp uri.h
-
-inkscape_private_libs =	\
-	libinkpre.a		\
-	application/libinkapp.a	\
-	ui/dialog/libuidialog.a	\
-	dialogs/libspdialogs.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	\
-	ui/view/libuiview.a	\
-	ui/libui.a		\
-	ui/widget/libuiwidget.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/internal/libwpg/libwpg.a	\
-	extension/script/libscript.a	\
-        dom/libdom.a            \
-	xml/libspxml.a		\
-	util/libinkutil.a	\
-	io/libio.a	        \
-	$(inkjar_libs)		\
-	libinkpost.a		\
-	debug/libinkdebug.a
+	uri.cpp uri.h	\
+	helper/pixbuf-ops.cpp	\
+	helper/pixbuf-ops.h
 
-all_libs =			\
-	$(inkscape_private_libs)	\
-	$(INKSCAPE_LIBS)	\
-	$(GNOME_PRINT_LIBS)	\
-	$(GNOME_VFS_LIBS)	\
-	$(XFT_LIBS)		\
-	$(FREETYPE_LIBS)	\
-	$(kdeldadd)		\
-	$(win32ldflags)		\
-	$(PERL_LIBS)		\
-	$(PYTHON_LIBS)	\
-	$(LIBLOUDMOUTH_LIBS) \
-	$(INKBOARD_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
 
 
 # ################################################
@@ -374,24 +311,47 @@ inkscape_LDFLAGS = --export-dynamic $(kdeldflags)
 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