Move around files to remove some vanity directories.

Also remove the obsolete IDL file stub.

(bzr r9194)

5 files changed, 1 insertions, 29 deletions

diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout.cpp
index 23b0ee13b..a89af10af 100644
--- a/src/graphlayout/graphlayout.cpp
+++ b/src/graphlayout.cpp
@@ -23,7 +23,7 @@
 #include "inkscape.h"
 #include "sp-namedview.h"
 #include "util/glib-list-iterators.h"
-#include "graphlayout/graphlayout.h"
+#include "graphlayout.h"
 #include "sp-path.h"
 #include "sp-item.h"
 #include "sp-item-transform.h"
diff --git a/src/graphlayout/graphlayout.h b/src/graphlayout.h
index 40090ef6b..40090ef6b 100644
--- a/src/graphlayout/graphlayout.h
+++ b/src/graphlayout.h
diff --git a/src/graphlayout/CMakeLists.txt b/src/graphlayout/CMakeLists.txt
deleted file mode 100644
index c8847a228..000000000
--- a/src/graphlayout/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-SET(graphlayout_SRC
-graphlayout.cpp
-)
-ADD_LIBRARY(graphlayout STATIC ${graphlayout_SRC})
-TARGET_LINK_LIBRARIES(graphlayout
-2geom ${INKSCAPE_LIBS})
\ No newline at end of file
diff --git a/src/graphlayout/Makefile_insert b/src/graphlayout/Makefile_insert
deleted file mode 100644
index 790c951ae..000000000
--- a/src/graphlayout/Makefile_insert
+++ /dev/null
@@ -1,5 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-ink_common_sources +=	\
-	graphlayout/graphlayout.cpp	\
-	graphlayout/graphlayout.h
diff --git a/src/graphlayout/makefile b/src/graphlayout/makefile
deleted file mode 100644
index 5d8ac906e..000000000
--- a/src/graphlayout/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-
-
-# Explicit so that it's the default rule.
-all:
-	cd .. && $(MAKE) graphlayout/all
-
-clean %.a %.o:
-	cd .. && $(MAKE) graphlayout/$@
-
-.PHONY: all clean
-
-OBJEXT = o
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)