5 files changed, 30 insertions, 50 deletions
diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 66571d06a..5a3ebebf8 100644
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -1,13 +1,3 @@
-set(domfolders
-	io
-	odf
-	util
-	#work
-)
-
-foreach(domlistsrc ${domfolders})
-	add_subdirectory(${domlistsrc})
-endforeach()
 
 set(dom_SRC
 	cssreader.cpp
@@ -28,11 +18,35 @@ set(dom_SRC
 	xpathimpl.cpp
 	xpathparser.cpp
 	xpathtoken.cpp
-	${dom_io_SRC}
-	${dom_odf_SRC}
-	${dom_util_SRC}
-	#${dom_work_SRC}
+
+	io/base64stream.cpp
+	io/bufferstream.cpp
+	io/domstream.cpp
+	io/gzipstream.cpp
+	# io/httpclient.cpp
+	io/socket.cpp
+	io/stringstream.cpp
+	io/uristream.cpp
+
+	odf/odfdocument.cpp
+	#odf/SvgOdg.cpp
+
+	util/digest.cpp
+	util/thread.cpp
+	util/ziptool.cpp
+
+	# # Dont use any of them.
+	# work/svg2.cpp
+	# work/testdom.cpp
+	# work/testhttp.cpp
+	# work/testjs.cpp
+	# work/testodf.cpp
+	# work/testsvg.cpp
+	# work/testuri.cpp
+	# work/testxpath.cpp
+	# work/testzip.cpp
+	# work/xpathtests.cpp
+
 )
 
-add_library(dom_LIB STATIC ${dom_SRC})
-target_link_libraries(dom_LIB 2geom_LIB ${INKSCAPE_LIBS})
+add_library(dom_LIB ${dom_SRC})
diff --git a/src/dom/io/CMakeLists.txt b/src/dom/io/CMakeLists.txt
deleted file mode 100644
index 7b99c898f..000000000
--- a/src/dom/io/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(dom_io_SRC
-	base64stream.cpp
-	bufferstream.cpp
-	domstream.cpp
-	gzipstream.cpp
-	# httpclient.cpp
-	socket.cpp
-	stringstream.cpp
-	uristream.cpp
-)
-
diff --git a/src/dom/odf/CMakeLists.txt b/src/dom/odf/CMakeLists.txt
deleted file mode 100644
index 089f65fbf..000000000
--- a/src/dom/odf/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(dom_odf_SRC
-	odfdocument.cpp
-	#SvgOdg.cpp
-)
-
diff --git a/src/dom/util/CMakeLists.txt b/src/dom/util/CMakeLists.txt
deleted file mode 100644
index e5f583fa5..000000000
--- a/src/dom/util/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(dom_util_SRC
-	digest.cpp
-	thread.cpp
-	ziptool.cpp
-)
-
diff --git a/src/dom/work/CMakeLists.txt b/src/dom/work/CMakeLists.txt
deleted file mode 100644
index 52552c8b9..000000000
--- a/src/dom/work/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(dom_work_SRC
-	#testdom.cpp
-	#testhttp.cpp
-	#testjs.cpp
-	#testodf.cpp
-	#testsvg.cpp
-	#testuri.cpp
-	#testxpath.cpp
-	#testzip.cpp
-	#xpathtests.cpp
-)
-