summaryrefslogtreecommitdiffstats
path: root/src/libavoid
diff options
context:
space:
mode:
authorEric Greveson <eric@greveson.co.uk>2013-07-03 22:57:43 +0000
committerEric Greveson <eric@greveson.co.uk>2013-07-03 22:57:43 +0000
commita99dd8508525d8519e46b0acd22e550bf3e39d62 (patch)
treeca6c9b77a81e16b500ceedd873838e2a0b06d006 /src/libavoid
parentChanged dbus interface to treat 'division' like other boolops, with a new (diff)
parentShape calculations. do not quantize the coordinates. (Bug 168158) (diff)
downloadinkscape-a99dd8508525d8519e46b0acd22e550bf3e39d62.tar.gz
inkscape-a99dd8508525d8519e46b0acd22e550bf3e39d62.zip
Merge recent changes from inkscape trunk
(bzr r12387.1.6)
Diffstat (limited to 'src/libavoid')
-rw-r--r--src/libavoid/makefile17
1 files changed, 0 insertions, 17 deletions
diff --git a/src/libavoid/makefile b/src/libavoid/makefile
deleted file mode 100644
index e4f83a52d..000000000
--- a/src/libavoid/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-
-
-OBJEXT = o
-
-# Explicit so that it's the default rule.
-all:
- cd .. && $(MAKE) libavoid/all
-
-clean %.a %.$(OBJEXT):
- cd .. && $(MAKE) libavoid/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)