X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2FMakefile_insert;h=36c9de34fa25cdd3045a4923d9adb0255ddd144f;hb=a401603e1e2635fadeec3b7a3a48de442da93472;hp=360f69cc45ad8bbae941c5e36fafd8ab4a959fc3;hpb=c5e2a1c98cba51b6093b8b341f83490a7b47f25e;p=inkscape.git diff --git a/src/Makefile_insert b/src/Makefile_insert index 360f69cc4..36c9de34f 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -1,25 +1,8 @@ ## Makefile.am fragment, included by src/Makefile.am. - -# ################################################ -# -# I N K S C A P E -# -# ################################################ - -# libinkpre.a: any object that's sharable between inkscape & inkview, -# and isn't needed by object files in subdirectories (i.e. libinkpre.a -# comes before subdirectory libraries on the link line). -# -# Excludes winmain.cpp (a gui wrapper around main): I'm guessing that -# it needs to be explicitly listed as a source of each graphical -# binary: it isn't (to my knowledge) called by main (whether directly -# or indirectly), so I don't think that putting it in a library will -# suffice to get it linked in. Windows devel please confirm. -- pjrm. - ink_common_sources += \ - algorithms/find-last-if.h \ - algorithms/longest-common-suffix.h \ + util/find-last-if.h \ + util/longest-common-suffix.h \ approx-equal.h remove-last.h \ arc-context.cpp arc-context.h \ attributes.cpp attributes.h \ @@ -37,13 +20,13 @@ ink_common_sources += \ composite-undo-stack-observer.cpp \ composite-undo-stack-observer.h \ conditions.cpp conditions.h \ + connection-points.cpp connection-points.h \ conn-avoid-ref.cpp conn-avoid-ref.h \ connection-pool.h \ connector-context.cpp connector-context.h \ console-output-undo-observer.h console-output-undo-observer.cpp \ context-fns.cpp context-fns.h \ decimal-round.h \ - desktop-affine.h \ desktop.cpp desktop.h \ desktop-events.cpp desktop-events.h \ desktop-handles.cpp desktop-handles.h \ @@ -74,7 +57,6 @@ ink_common_sources += \ fixes.cpp \ flood-context.cpp flood-context.h \ forward.h \ - gc-allocator.h \ gc-alloc.h \ gc-anchored.h gc-anchored.cpp \ gc-core.h \ @@ -85,6 +67,7 @@ ink_common_sources += \ gradient-chemistry.cpp gradient-chemistry.h \ gradient-context.cpp gradient-context.h \ gradient-drag.cpp gradient-drag.h \ + graphlayout.cpp graphlayout.h \ guide-snapper.cpp guide-snapper.h \ help.cpp help.h \ helper-fns.h \ @@ -95,6 +78,8 @@ ink_common_sources += \ ige-mac-menu.h ige-mac-menu.c \ ink-action.cpp \ ink-action.h \ + ink-comboboxentry-action.cpp \ + ink-comboboxentry-action.h \ inkscape.cpp inkscape.h inkscape-private.h \ interface.cpp interface.h \ isinf.h \ @@ -119,8 +104,6 @@ ink_common_sources += \ message-stack.cpp message-stack.h \ mod360.cpp mod360.h \ modifier-fns.h \ - node-context.cpp node-context.h \ - nodepath.cpp nodepath.h \ object-edit.cpp object-edit.h \ object-hierarchy.cpp object-hierarchy.h \ object-snapper.cpp object-snapper.h \ @@ -137,6 +120,8 @@ ink_common_sources += \ print.cpp print.h \ profile-manager.cpp profile-manager.h \ proj_pt.cpp proj_pt.h \ + removeoverlap.cpp removeoverlap.h \ + rdf.cpp rdf.h \ rect-context.cpp rect-context.h \ require-config.h \ round.h \ @@ -152,6 +137,7 @@ ink_common_sources += \ shape-editor.cpp shape-editor.h \ shortcuts.cpp shortcuts.h \ snap.cpp snap.h \ + snap-enums.h snap-candidate.h \ snapped-curve.cpp snapped-curve.h \ snapped-line.cpp snapped-line.h \ snapped-point.cpp snapped-point.h \ @@ -225,8 +211,7 @@ ink_common_sources += \ sp-shape.cpp sp-shape.h \ sp-spiral.cpp sp-spiral.h \ sp-star.cpp sp-star.h \ - sp-stop-fns.h \ - sp-stop.h \ + sp-stop.cpp sp-stop.h \ sp-string.cpp sp-string.h \ sp-style-elem.cpp sp-style-elem.h \ sp-switch.cpp sp-switch.h \ @@ -239,6 +224,7 @@ ink_common_sources += \ sp-tspan.cpp sp-tspan.h \ sp-use.cpp sp-use.h \ sp-use-reference.cpp sp-use-reference.h \ + spray-context.cpp spray-context.h \ star-context.cpp star-context.h \ streq.h \ strneq.h \ @@ -254,8 +240,7 @@ ink_common_sources += \ tools-switch.cpp tools-switch.h \ transf_mat_3x4.cpp transf_mat_3x4.h \ tweak-context.h tweak-context.cpp \ - ui/context-menu.cpp \ - ui/context-menu.h \ + unclump.cpp unclump.h \ undo-stack-observer.h \ unicoderange.cpp unicoderange.h \ unit-constants.h \ @@ -276,33 +261,6 @@ selection.$(OBJEXT): helper/sp-marshal.h sp-object.$(OBJEXT): helper/sp-marshal.h view.$(OBJEXT): helper/sp-marshal.h -libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h - -if USE_SVN_VERSION -inkscape_version_deps = $(top_srcdir)/.svn/entries -endif - -# If this is an SVN snapshot build, regenerate this file every time -# someone updates the SVN working directory. -inkscape-version.cpp: $(inkscape_version_deps) - 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 - # ###################### # ### CxxTest stuff #### # ###################### @@ -314,6 +272,7 @@ CXXTEST_TESTSUITES += \ $(srcdir)/color-profile-test.h \ $(srcdir)/dir-util-test.h \ $(srcdir)/extract-uri-test.h \ + $(srcdir)/marker-test.h \ $(srcdir)/mod360-test.h \ $(srcdir)/round-test.h \ $(srcdir)/preferences-test.h \