9 files changed, 100 insertions, 134 deletions
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index 47cfbe9e4..3d8777e3a 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -1,17 +1,3 @@
-set(extfolders
-	#dxf2svg
-	implementation
-	internal
-	internal/bitmap
-	internal/filter
-	internal/pdfinput
-	param
-	script
-)
-
-foreach(extlistsrc ${extfolders})
-  add_subdirectory(${extlistsrc})
-endforeach()
 
 set(extension_SRC
 	db.cpp
@@ -28,14 +14,105 @@ set(extension_SRC
 	print.cpp
 	system.cpp
 	timer.cpp
-	#${extension_dxf2svg_SRC}
-	${extension_implementation_SRC}
-	${extension_internal_bitmap_SRC}
-	${extension_internal_filter_SRC}
-	${extension_internal_pdfinput_SRC}
-	${extension_param_SRC}
-	${extension_script_SRC}
+
+	implementation/implementation.cpp
+	implementation/xslt.cpp
+	implementation/script.cpp
+
+	param/bool.cpp
+	param/color.cpp
+	param/description.cpp
+	param/enum.cpp
+	param/float.cpp
+	param/int.cpp
+	param/notebook.cpp
+	param/parameter.cpp
+	param/radiobutton.cpp
+	param/string.cpp
+	
+	internal/bluredge.cpp
+	internal/cairo-png-out.cpp
+	internal/cairo-ps-out.cpp
+	# internal/cairo-render-context.cpp  # XXX MUST GET THIS WORKING
+	# internal/cairo-renderer.cpp  # XXX MUST GET THIS WORKING
+	internal/cairo-renderer-pdf-out.cpp
+	internal/emf-win32-inout.cpp
+	internal/emf-win32-print.cpp
+	internal/gdkpixbuf-input.cpp
+	internal/gimpgrad.cpp
+	internal/grid.cpp
+	internal/latex-pstricks.cpp
+	# internal/latex-pstricks-out.cpp  # XXX MUST GET THIS WORKING
+	internal/odf.cpp
+	internal/latex-text-renderer.cpp
+	internal/pdf-input-cairo.cpp
+	internal/pov-out.cpp
+	internal/javafx-out.cpp
+	internal/svg.cpp
+	internal/svgz.cpp
+	internal/wpg-input.cpp
+
+	internal/bitmap/adaptiveThreshold.cpp
+	internal/bitmap/addNoise.cpp
+	internal/bitmap/blur.cpp
+	internal/bitmap/channel.cpp
+	internal/bitmap/charcoal.cpp
+	internal/bitmap/colorize.cpp
+	internal/bitmap/contrast.cpp
+	internal/bitmap/cycleColormap.cpp
+	internal/bitmap/despeckle.cpp
+	internal/bitmap/edge.cpp
+	internal/bitmap/emboss.cpp
+	internal/bitmap/enhance.cpp
+	internal/bitmap/equalize.cpp
+	internal/bitmap/gaussianBlur.cpp
+	internal/bitmap/imagemagick.cpp
+	internal/bitmap/implode.cpp
+	internal/bitmap/level.cpp
+	internal/bitmap/levelChannel.cpp
+	internal/bitmap/medianFilter.cpp
+	internal/bitmap/modulate.cpp
+	internal/bitmap/negate.cpp
+	internal/bitmap/normalize.cpp
+	internal/bitmap/oilPaint.cpp
+	internal/bitmap/opacity.cpp
+	internal/bitmap/raise.cpp
+	internal/bitmap/reduceNoise.cpp
+	internal/bitmap/sample.cpp
+	internal/bitmap/shade.cpp
+	internal/bitmap/sharpen.cpp
+	internal/bitmap/solarize.cpp
+	internal/bitmap/spread.cpp
+	internal/bitmap/swirl.cpp
+	internal/bitmap/threshold.cpp
+	internal/bitmap/unsharpmask.cpp
+	internal/bitmap/wave.cpp
+
+	internal/filter/filter-all.cpp
+	internal/filter/filter-file.cpp
+	internal/filter/filter.cpp
+
+	internal/pdfinput/pdf-input.cpp
+	internal/pdfinput/pdf-parser.cpp
+	internal/pdfinput/svg-builder.cpp
+
+	script/InkscapeScript.cpp
+
+	# dxf2svg/aci2rgb.cpp
+	# dxf2svg/entities2elements.cpp
+	# dxf2svg/tables2svg_info.cpp
+	# dxf2svg/blocks.cpp
+	# dxf2svg/entities.cpp
+	# dxf2svg/tables.cpp
+	# dxf2svg/dxf2svg.cpp
+	# dxf2svg/read_dxf.cpp
+	# dxf2svg/test_dxf.cpp
 )
 
-add_library(extension_LIB STATIC ${extension_SRC})
-target_link_libraries(extension_LIB 2geom_LIB ${INKSCAPE_LIBS})
+if(WIN32)
+	list(APPEND extension_SRC
+		win32.cpp
+	)
+endif()
+
+add_library(extension_LIB ${extension_SRC})
diff --git a/src/extension/dxf2svg/CMakeLists.txt b/src/extension/dxf2svg/CMakeLists.txt
deleted file mode 100644
index 0ff0eaec0..000000000
--- a/src/extension/dxf2svg/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-set(extension_dxf2svg_SRC
-	#aci2rgb.cpp
-	#entities2elements.cpp
-	#tables2svg_info.cpp
-	#blocks.cpp
-	#entities.cpp
-	#tables.cpp
-	#dxf2svg.cpp
-	#read_dxf.cpp
-	#test_dxf.cpp
-)
diff --git a/src/extension/implementation/CMakeLists.txt b/src/extension/implementation/CMakeLists.txt
deleted file mode 100644
index dcdf092c2..000000000
--- a/src/extension/implementation/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(extension_implementation_SRC
-	implementation.cpp
-	xslt.cpp
-	script.cpp
-)
diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt
deleted file mode 100644
index d13ec9f74..000000000
--- a/src/extension/internal/CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-set(extension_internal_SRC
-	bluredge.cpp
-	cairo-png-out.cpp
-	cairo-ps-out.cpp
-	cairo-render-context.cpp
-	cairo-renderer.cpp
-	cairo-renderer-pdf-out.cpp
-	emf-win32-inout.cpp
-	emf-win32-print.cpp
-	gdkpixbuf-input.cpp
-	gimpgrad.cpp
-	grid.cpp
-	latex-pstricks.cpp
-	latex-pstricks-out.cpp
-	odf.cpp
-	latex-text-renderer.cpp
-	pdf-input-cairo.cpp
-	pov-out.cpp
-	javafx-out.cpp
-	svg.cpp
-	svgz.cpp
-	wpg-input.cpp
-)
-
-if(WIN32)
-	list(APPEND extension_internal_SRC
-		win32.cpp
-	)
-endif()
diff --git a/src/extension/internal/bitmap/CMakeLists.txt b/src/extension/internal/bitmap/CMakeLists.txt
deleted file mode 100644
index a273804ba..000000000
--- a/src/extension/internal/bitmap/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-set(extension_internal_bitmap_SRC
-	adaptiveThreshold.cpp
-	addNoise.cpp
-	blur.cpp
-	channel.cpp
-	charcoal.cpp
-	colorize.cpp
-	contrast.cpp
-	cycleColormap.cpp
-	despeckle.cpp
-	edge.cpp
-	emboss.cpp
-	enhance.cpp
-	equalize.cpp
-	gaussianBlur.cpp
-	imagemagick.cpp
-	implode.cpp
-	levelChannel.cpp
-	level.cpp
-	medianFilter.cpp
-	modulate.cpp
-	negate.cpp
-	normalize.cpp
-	oilPaint.cpp
-	opacity.cpp
-	raise.cpp
-	reduceNoise.cpp
-	sample.cpp
-	shade.cpp
-	sharpen.cpp
-	solarize.cpp
-	spread.cpp
-	swirl.cpp
-	threshold.cpp
-	unsharpmask.cpp
-	wave.cpp
-)
diff --git a/src/extension/internal/filter/CMakeLists.txt b/src/extension/internal/filter/CMakeLists.txt
deleted file mode 100644
index 349504f94..000000000
--- a/src/extension/internal/filter/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-set(extension_internal_filter_SRC
-	drop-shadow.h
-	filter-all.cpp
-	filter.cpp
-	filter-file.cpp
-	filter.h
-	snow.h
-)
diff --git a/src/extension/internal/pdfinput/CMakeLists.txt b/src/extension/internal/pdfinput/CMakeLists.txt
deleted file mode 100644
index fe31c2a7f..000000000
--- a/src/extension/internal/pdfinput/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(extension_internal_pdfinput_SRC
-	pdf-input.cpp
-	pdf-parser.cpp
-	svg-builder.cpp
-)
diff --git a/src/extension/param/CMakeLists.txt b/src/extension/param/CMakeLists.txt
deleted file mode 100644
index b2981308e..000000000
--- a/src/extension/param/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(extension_param_SRC
-	bool.cpp
-	color.cpp
-	description.cpp
-	enum.cpp
-	float.cpp
-	int.cpp
-	notebook.cpp
-	parameter.cpp
-	radiobutton.cpp
-	string.cpp
-)
-
diff --git a/src/extension/script/CMakeLists.txt b/src/extension/script/CMakeLists.txt
deleted file mode 100644
index 88977164e..000000000
--- a/src/extension/script/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-set(extension_script_SRC
-	InkscapeScript.cpp
-)