41 files changed, 32 insertions, 123 deletions

diff --git a/Makefile.am b/Makefile.am
index 2a455c383..e2bce7530 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,8 @@
 # Makefile.am
-SUBDIRS = src 
+
+NULL = 
+
+
+SUBDIRS = src \
+          icons \
+          $(NULL)
diff --git a/configure.in b/configure.in
index 482fd65cf..8f37d37e4 100644
--- a/configure.in
+++ b/configure.in
@@ -64,16 +64,12 @@ AC_SUBST(LIBGDKPIXBUF_LIBS)
 AC_CONFIG_FILES([Makefile
                  src/libvaladoc/valadoc-1.0.pc
                  src/Makefile
+                 icons/Makefile
                  src/libvaladoc/Makefile
                  src/doclets/Makefile
-                 src/doclets/htmlhelpers/Makefile
-                 src/doclets/htmlhelpers/deps/Makefile
-                 src/doclets/htmlhelpers/doclet/Makefile
                  src/doclets/htm/Makefile
-                 src/doclets/htm/doclet/Makefile
                  src/doclets/valadoc.org/Makefile
                  src/doclets/devhelp/Makefile
-                 src/doclets/devhelp/doclet/Makefile
                  src/valadoc/Makefile])
 
 AC_OUTPUT
diff --git a/src/doclets/htmlhelpers/deps/Makefile.am b/icons/Makefile.am
index bf1f4fd1f..bf1f4fd1f 100644
--- a/src/doclets/htmlhelpers/deps/Makefile.am
+++ b/icons/Makefile.am
diff --git a/src/doclets/htmlhelpers/deps/abstractclass.png b/icons/abstractclass.png
index 4aaf9379b..4aaf9379b 100644
--- a/src/doclets/htmlhelpers/deps/abstractclass.png
+++ b/icons/abstractclass.png
diff --git a/src/doclets/htmlhelpers/deps/abstractmethod.png b/icons/abstractmethod.png
index 93003f7b3..93003f7b3 100644
--- a/src/doclets/htmlhelpers/deps/abstractmethod.png
+++ b/icons/abstractmethod.png
diff --git a/src/doclets/htmlhelpers/deps/abstractproperty.png b/icons/abstractproperty.png
index ea9e09a80..ea9e09a80 100644
--- a/src/doclets/htmlhelpers/deps/abstractproperty.png
+++ b/icons/abstractproperty.png
diff --git a/src/doclets/htmlhelpers/deps/class.png b/icons/class.png
index f8e82b556..f8e82b556 100644
--- a/src/doclets/htmlhelpers/deps/class.png
+++ b/icons/class.png
diff --git a/src/doclets/htmlhelpers/deps/constant.png b/icons/constant.png
index 85e248df4..85e248df4 100644
--- a/src/doclets/htmlhelpers/deps/constant.png
+++ b/icons/constant.png
diff --git a/src/doclets/htmlhelpers/deps/constructor.png b/icons/constructor.png
index eee173892..eee173892 100644
--- a/src/doclets/htmlhelpers/deps/constructor.png
+++ b/icons/constructor.png
diff --git a/src/doclets/htmlhelpers/deps/delegate.png b/icons/delegate.png
index 3ad818b4d..3ad818b4d 100644
--- a/src/doclets/htmlhelpers/deps/delegate.png
+++ b/icons/delegate.png
diff --git a/src/doclets/htmlhelpers/deps/enum.png b/icons/enum.png
index 9d534b5fe..9d534b5fe 100644
--- a/src/doclets/htmlhelpers/deps/enum.png
+++ b/icons/enum.png
diff --git a/src/doclets/htmlhelpers/deps/errordomain.png b/icons/errordomain.png
index cbe3fe038..cbe3fe038 100644
--- a/src/doclets/htmlhelpers/deps/errordomain.png
+++ b/icons/errordomain.png
diff --git a/src/doclets/htmlhelpers/deps/field.png b/icons/field.png
index 5515f7e66..5515f7e66 100644
--- a/src/doclets/htmlhelpers/deps/field.png
+++ b/icons/field.png
diff --git a/src/doclets/htmlhelpers/deps/interface.png b/icons/interface.png
index 83a958809..83a958809 100644
--- a/src/doclets/htmlhelpers/deps/interface.png
+++ b/icons/interface.png
diff --git a/src/doclets/htmlhelpers/deps/method.png b/icons/method.png
index 516c2ff2c..516c2ff2c 100644
--- a/src/doclets/htmlhelpers/deps/method.png
+++ b/icons/method.png
diff --git a/src/doclets/htmlhelpers/deps/namespace.png b/icons/namespace.png
index 759846f72..759846f72 100644
--- a/src/doclets/htmlhelpers/deps/namespace.png
+++ b/icons/namespace.png
diff --git a/src/doclets/htmlhelpers/deps/package.png b/icons/package.png
index cc6718776..cc6718776 100644
--- a/src/doclets/htmlhelpers/deps/package.png
+++ b/icons/package.png
diff --git a/src/doclets/htmlhelpers/deps/packages.png b/icons/packages.png
index d99004a28..d99004a28 100644
--- a/src/doclets/htmlhelpers/deps/packages.png
+++ b/icons/packages.png
diff --git a/src/doclets/htmlhelpers/deps/property.png b/icons/property.png
index 3b9641387..3b9641387 100644
--- a/src/doclets/htmlhelpers/deps/property.png
+++ b/icons/property.png
diff --git a/src/doclets/htmlhelpers/deps/signal.png b/icons/signal.png
index 55f19662c..55f19662c 100644
--- a/src/doclets/htmlhelpers/deps/signal.png
+++ b/icons/signal.png
diff --git a/src/doclets/htmlhelpers/deps/staticmethod.png b/icons/staticmethod.png
index 4e76a248a..4e76a248a 100644
--- a/src/doclets/htmlhelpers/deps/staticmethod.png
+++ b/icons/staticmethod.png
diff --git a/src/doclets/htmlhelpers/deps/struct.png b/icons/struct.png
index 2acb79ab4..2acb79ab4 100644
--- a/src/doclets/htmlhelpers/deps/struct.png
+++ b/icons/struct.png
diff --git a/src/doclets/htmlhelpers/deps/style.css b/icons/style.css
index 963b1cf49..963b1cf49 100644
--- a/src/doclets/htmlhelpers/deps/style.css
+++ b/icons/style.css
diff --git a/src/doclets/htmlhelpers/deps/virtualmethod.png b/icons/virtualmethod.png
index 5ff14ecf7..5ff14ecf7 100644
--- a/src/doclets/htmlhelpers/deps/virtualmethod.png
+++ b/icons/virtualmethod.png
diff --git a/src/doclets/htmlhelpers/deps/virtualproperty.png b/icons/virtualproperty.png
index 795374629..795374629 100644
--- a/src/doclets/htmlhelpers/deps/virtualproperty.png
+++ b/icons/virtualproperty.png
diff --git a/src/doclets/htmlhelpers/deps/warning.png b/icons/warning.png
index ecdc0f924..ecdc0f924 100644
--- a/src/doclets/htmlhelpers/deps/warning.png
+++ b/icons/warning.png
diff --git a/src/doclets/htmlhelpers/deps/wikistyle.css b/icons/wikistyle.css
index 5990d11f9..5990d11f9 100644
--- a/src/doclets/htmlhelpers/deps/wikistyle.css
+++ b/icons/wikistyle.css
diff --git a/src/doclets/Makefile.am b/src/doclets/Makefile.am
index 126e927e0..758d35ec3 100644
--- a/src/doclets/Makefile.am
+++ b/src/doclets/Makefile.am
@@ -3,8 +3,7 @@
 NULL =
 
 
-SUBDIRS = htmlhelpers \
-          htm \
+SUBDIRS = htm \
           devhelp \
           valadoc.org \
           $(NULL)
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 7e8941332..9f3a90ef8 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -2,9 +2,8 @@ NULL =
 
 
 AM_CFLAGS =  -g \
-	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBXML2_CFLAGS) \
@@ -36,13 +35,12 @@ libdoclet_la_SOURCES =      \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg libxml-2.0 --pkg gee-1.0 --basedir . $^
 	touch $@
 
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS) \
 	$(LIBXML2_LIBS) \
 	$(LIBVALA_LIBS) \
@@ -58,8 +56,3 @@ MAINTAINERCLEANFILES = \
 	$(NULL)
 
 
-install-data-hook:
-	cd $(libdir)/valadoc/plugins/devhelp/ && if test -d deps; then unlink deps; fi && ln -s ../htmlhelpers/deps 
-
-
-
diff --git a/src/doclets/devhelp/doclet.vala b/src/doclets/devhelp/doclet.vala
index feb054ff5..484f35997 100755
--- a/src/doclets/devhelp/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -25,10 +25,6 @@ using Xml;
 using Gee;
 
 
-[CCode (cname = "PACKAGE_PLUGINDIR")]
-public extern const string doclet_path;
-
-
 namespace Valadoc.Devhelp {
 	public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
 		if ( element is Visitable ) {
@@ -255,7 +251,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 
 		var rt = DirUtils.create (path, 0777);
 		rt = DirUtils.create (imgpath, 0777);
-		copy_directory (doclet_path + "deps/", path);
+		copy_directory (icons_dir, path);
 
 		this.devhelp = new DevhelpFormat (pkg_name, "");
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 0578bb503..c5a17f337 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -2,9 +2,8 @@ NULL =
 
 
 AM_CFLAGS =  -g \
-	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_CFLAGS) \
@@ -38,13 +37,12 @@ libdoclet_la_SOURCES =  \
 
 
 libdoclet.vala.stamp: $(libdoclet_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet --pkg libhtmlhelpers-1.0 --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
+	$(VALAC) -C --vapidir ../../vapi --vapidir ../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --basedir . $^
 	touch $@
 
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS) \
 	$(LIBGEE_LIBS) \
 	$(LIBVALA_LIBS) \
@@ -59,6 +57,3 @@ MAINTAINERCLEANFILES = \
 	$(NULL)
 
 
-install-data-hook:
-	cd $(libdir)/valadoc/plugins/html/ && if test -d deps; then unlink deps; fi && ln -s ../htmlhelpers/deps 
-
diff --git a/src/doclets/htm/doclet.vala b/src/doclets/htm/doclet.vala
index b6da05f60..552f33566 100755
--- a/src/doclets/htm/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -24,10 +24,6 @@ using Valadoc.Html;
 using Gee;
 
 
-[CCode (cname = "PACKAGE_PLUGINDIR")]
-public extern const string doclet_path;
-
-
 namespace Valadoc {
 	public string? get_html_link ( Settings settings, Documentation element, Documentation? pos ) {
 		if ( element is Visitable ) {
@@ -122,7 +118,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 		this.settings = settings;
 
 		DirUtils.create (this.settings.path, 0777);
-		copy_directory (GLib.Path.build_filename (doclet_path, "deps"), settings.path);
+		copy_directory (icons_dir, settings.path);
 
 		write_wiki_pages (tree, css_path_wiki, Path.build_filename(settings.path, "content"));
 
diff --git a/src/doclets/htmlhelpers/Makefile.am b/src/doclets/htmlhelpers/Makefile.am
deleted file mode 100644
index fb343527c..000000000
--- a/src/doclets/htmlhelpers/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-NULL =
-
-
-SUBDIRS =     \
-	doclet    \
-	deps      \
-	$(NULL)
diff --git a/src/doclets/htmlhelpers/doclet/Makefile.am b/src/doclets/htmlhelpers/doclet/Makefile.am
deleted file mode 100755
index f69abb4f5..000000000
--- a/src/doclets/htmlhelpers/doclet/Makefile.am
+++ /dev/null
@@ -1,71 +0,0 @@
-NULL =
-
-
-AM_CFLAGS =                   \
-	-I ../../../libvaladoc/   \
-	$(LIBGVC_CFLAGS)          \
-	$(LIBVALA_CFLAGS)         \
-	$(GLIB_CFLAGS)            \
-	$(LIBGEE_CFLAGS)          \
-	$(NULL)
-
-
-
-BUILT_SOURCES = libhtmlhelpers.vala.stamp
-
-
-htmlhelpersdir = $(libdir)/valadoc/plugins/htmlhelpers//
-
-
-htmlhelpers_LTLIBRARIES =   \
-	libhtmlhelpers.la  \
-	$(NULL)
-
-
-libhtmlhelpers_la_VALASOURCES = \
-	globals.vala                \
-	doclet.vala                 \
-	htmlrenderer.vala           \
-	markupwriter.vala           \
-	$(NULL)
-
-
-libhtmlhelpers_la_SOURCES =                \
-	libhtmlhelpers.vala.stamp              \
-	$(libhtmlhelpers_la_VALASOURCES:.vala=.c) \
-	$(NULL)
-
-
-libhtmlhelpersinclude_HEADERS =  \
-	libhtmlhelpers-1.0.h         \
-	$(NULL)
-
-
-libhtmlhelpersincludedir = $(includedir)/vala-1.0
-
-
-libhtmlhelpers.vala.stamp: $(libhtmlhelpers_la_VALASOURCES)
-	$(VALAC) -C -H libhtmlhelpers-1.0.h --library libhtmlhelpers-1.0 --basedir . --vapidir ../../../vapi --vapidir ../../../libvaladoc --pkg valadoc-1.0 --pkg gee-1.0 --save-temps $^
-	touch $@
-
-
-libhtmlhelpers_la_LIBADD =              \
-	../../../libvaladoc/libvaladoc.la   \
-	$(LIBGVC_LIBS)                      \
-	$(LIBVALA_LIBS)                     \
-	$(GLIB_LIBS)                        \
-	$(LIBGEE_LIBS)                      \
-	$(NULL)
-
-
-EXTRA_DIST = $(libhtmlhelpers_la_VALASOURCES)  libhtmlhelpers.vala.stamp 
-
-
-MAINTAINERCLEANFILES =                        \
-	libhtmlhelpers-1.0.vapi                   \
-	libhtmlhelpers-1.0.gir                    \
-	libhtmlhelpers-1.0.h                      \
-	$(libhtmlhelpers_la_VALASOURCES:.vala=.c) \
-	$(NULL)
-
-
diff --git a/src/doclets/valadoc.org/Makefile.am b/src/doclets/valadoc.org/Makefile.am
index c56d97862..2d5483660 100755
--- a/src/doclets/valadoc.org/Makefile.am
+++ b/src/doclets/valadoc.org/Makefile.am
@@ -11,7 +11,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-	$(VALAC) -C --vapidir ../htmlhelpers/doclet/ --pkg libhtmlhelpers-1.0 --vapidir ../../libvaladoc/ --vapidir ../../vapi/ --pkg valadoc-1.0 --pkg gee-1.0 --basedir . --save-temps $^
+	$(VALAC) -C --vapidir ../../libvaladoc/ --vapidir ../../vapi/ --pkg valadoc-1.0 --pkg gee-1.0 --basedir . --save-temps $^
 	touch $@
 
 
@@ -30,8 +30,8 @@ libdoclet_la_SOURCES = \
 
 
 AM_CFLAGS =  -g \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
-	-I ../htmlhelpers/doclet/ \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_CFLAGS) \
@@ -44,7 +44,6 @@ libdoclet_la_LDFLAGS = -module -avoid-version \
 
 libdoclet_la_LIBADD = \
 	../../libvaladoc/libvaladoc.la \
-	../htmlhelpers/doclet/libhtmlhelpers.la \
 	$(GLIB_LIBS)  \
 	$(LIBGEE_LIBS) \
 	$(LIBVALA_LIBS) \
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 276494803..d6567ed6c 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -1,13 +1,14 @@
 NULL =
 
 
-AM_CFLAGS =             \
-	$(LIBGVC_CFLAGS)    \
-	$(LIBXML2_CFLAGS)   \
-	$(GLIB_CFLAGS)      \
-	$(LIBGEE_CFLAGS)    \
-	$(LIBVALA_CFLAGS)   \
-	$(GMODULE_CFLAGS)   \
+AM_CFLAGS = \
+	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
+	$(LIBGVC_CFLAGS) \
+	$(LIBXML2_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(LIBGEE_CFLAGS) \
+	$(LIBVALA_CFLAGS) \
+	$(GMODULE_CFLAGS) \
 	$(NULL)
 
 
@@ -113,6 +114,10 @@ libvaladoc_la_VALASOURCES = \
 	taglets/tagletsee.vala \
 	taglets/tagletsince.vala \
 	taglets/tagletthrows.vala \
+	html-doclet/html-doclet.vala \
+	html-doclet/html-globals.vala \
+	html-doclet/html-markupwriter.vala \
+	html-doclet/html-renderer.vala \
 	$(NULL)
 
 
diff --git a/src/libvaladoc/filehelper.vala b/src/libvaladoc/filehelper.vala
index 5efe9f77e..a7b6f966a 100755
--- a/src/libvaladoc/filehelper.vala
+++ b/src/libvaladoc/filehelper.vala
@@ -21,6 +21,9 @@ using Gee;
 
 
 namespace Valadoc {
+	[CCode (cprefix = "", cname = "PACKAGE_ICONDIR")]
+	public extern const string icons_dir;
+
 	public bool copy_file (string src, string dest) {
 		GLib.FileStream fsrc = GLib.FileStream.open (src, "rb");
 		if (fsrc == null) {
diff --git a/src/doclets/htmlhelpers/doclet/doclet.vala b/src/libvaladoc/html-doclet/html-doclet.vala
index 262b68b09..50a16d707 100755
--- a/src/doclets/htmlhelpers/doclet/doclet.vala
+++ b/src/libvaladoc/html-doclet/html-doclet.vala
@@ -17,7 +17,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-using GLib;
 using Valadoc.Content;
 using Valadoc.Api;
 
diff --git a/src/doclets/htmlhelpers/doclet/globals.vala b/src/libvaladoc/html-doclet/html-globals.vala
index 57229efd2..57229efd2 100755
--- a/src/doclets/htmlhelpers/doclet/globals.vala
+++ b/src/libvaladoc/html-doclet/html-globals.vala
diff --git a/src/doclets/htmlhelpers/doclet/markupwriter.vala b/src/libvaladoc/html-doclet/html-markupwriter.vala
index ce821da8b..ce821da8b 100755
--- a/src/doclets/htmlhelpers/doclet/markupwriter.vala
+++ b/src/libvaladoc/html-doclet/html-markupwriter.vala
diff --git a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala b/src/libvaladoc/html-doclet/html-renderer.vala
index 3ff91d841..3ff91d841 100755
--- a/src/doclets/htmlhelpers/doclet/htmlrenderer.vala
+++ b/src/libvaladoc/html-doclet/html-renderer.vala