summaryrefslogtreecommitdiffstats
path: root/src/dialogs
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-09-02 21:14:55 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-09-02 21:14:55 +0000
commit395b34493e806b4aa2333c694d7d6e4e4d4700a4 (patch)
treee340f04499db88b56d1e86bac1cc3cf70b33f2ee /src/dialogs
parentUpdate to trunk r13542 (diff)
downloadinkscape-395b34493e806b4aa2333c694d7d6e4e4d4700a4.tar.gz
inkscape-395b34493e806b4aa2333c694d7d6e4e4d4700a4.zip
Remove misleading dialogs directory
(bzr r13341.1.192)
Diffstat (limited to '')
-rw-r--r--src/dialogs/CMakeLists.txt11
-rw-r--r--src/dialogs/Makefile_insert5
-rw-r--r--src/dialogs/makefile.in17
-rw-r--r--src/ui/dialog-events.cpp (renamed from src/dialogs/dialog-events.cpp)2
-rw-r--r--src/ui/dialog-events.h (renamed from src/dialogs/dialog-events.h)0
5 files changed, 1 insertions, 34 deletions
diff --git a/src/dialogs/CMakeLists.txt b/src/dialogs/CMakeLists.txt
deleted file mode 100644
index ca19c0b72..000000000
--- a/src/dialogs/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-set(dialogs_SRC
- dialog-events.cpp
-
- # -------
- # Headers
- dialog-events.h
-)
-
-# add_inkscape_lib(dialogs_LIB "${dialogs_SRC}")
-add_inkscape_source("${dialogs_SRC}")
diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert
deleted file mode 100644
index f1ed89314..000000000
--- a/src/dialogs/Makefile_insert
+++ /dev/null
@@ -1,5 +0,0 @@
-## Makefile.am fragment sourced by src/Makefile.am.
-
-ink_common_sources += \
- dialogs/dialog-events.cpp \
- dialogs/dialog-events.h
diff --git a/src/dialogs/makefile.in b/src/dialogs/makefile.in
deleted file mode 100644
index 9acaf79a0..000000000
--- a/src/dialogs/makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# Convenience stub makefile to call the real Makefile.
-
-@SET_MAKE@
-
-OBJEXT = @OBJEXT@
-
-# Explicit so that it's the default rule.
-all:
- cd .. && $(MAKE) dialogs/all
-
-clean %.a %.$(OBJEXT):
- cd .. && $(MAKE) dialogs/$@
-
-.PHONY: all clean
-
-.SUFFIXES:
-.SUFFIXES: .a .$(OBJEXT)
diff --git a/src/dialogs/dialog-events.cpp b/src/ui/dialog-events.cpp
index cf3497c9b..6bd93bbc3 100644
--- a/src/dialogs/dialog-events.cpp
+++ b/src/ui/dialog-events.cpp
@@ -29,7 +29,7 @@
#include "preferences.h"
#include "ui/tools/tool-base.h"
-#include "dialog-events.h"
+#include "ui/dialog-events.h"
/**
diff --git a/src/dialogs/dialog-events.h b/src/ui/dialog-events.h
index b33eb3f38..b33eb3f38 100644
--- a/src/dialogs/dialog-events.h
+++ b/src/ui/dialog-events.h