[valadoc] rm of conditional doclet directories

[Florian Brosch <flobrosch src gnome org>]

commit c8113568d7883610e0fa07af492d4d0d91fe2019
Author: Florian Brosch <flo brosch gmail com>
Date:   Wed Oct 21 16:28:12 2009 +0200

    rm of conditional doclet directories

 src/doclets/devhelp/Makefile.am              |   62 +++++++++++++++++++++++-
 src/doclets/devhelp/{doclet => }/doclet.vala |    7 ++-
 src/doclets/devhelp/doclet/Makefile.am       |   66 --------------------------
 src/doclets/devhelp/doclet/docletconfig.vapi |    7 ---
 src/doclets/htm/Makefile.am                  |   64 +++++++++++++++++++++++--
 src/doclets/htm/{doclet => }/doclet.vala     |    7 ++-
 src/doclets/htm/doclet/Makefile.am           |   65 -------------------------
 src/doclets/htm/doclet/docletconfig.vapi     |    7 ---
 8 files changed, 131 insertions(+), 154 deletions(-)
---
diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 47c7e60..7e89413 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -1,7 +1,65 @@
 NULL =
 
 
-SUBDIRS = doclet \
-          $(NULL)
+AM_CFLAGS =  -g \
+	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-I ../../libvaladoc/ \
+	-I ../htmlhelpers/doclet/ \
+	$(GLIB_CFLAGS) \
+	$(LIBGEE_CFLAGS) \
+	$(LIBXML2_CFLAGS) \
+	$(LIBVALA_CFLAGS) \
+	$(NULL)
+
+
+
+BUILT_SOURCES = libdoclet.vala.stamp
+
+
+docletdir = $(libdir)/valadoc/plugins/devhelp//
+
+
+doclet_LTLIBRARIES =  \
+	libdoclet.la \
+	$(NULL)
+
+
+libdoclet_la_VALASOURCES = \
+	doclet.vala \
+	$(NULL)
+
+
+libdoclet_la_SOURCES =      \
+	libdoclet.vala.stamp                 \
+	$(libdoclet_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+
+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 . $^
+	touch $@
+
+
+libdoclet_la_LIBADD = \
+	../../libvaladoc/libvaladoc.la \
+	../htmlhelpers/doclet/libhtmlhelpers.la \
+	$(GLIB_LIBS) \
+	$(LIBXML2_LIBS) \
+	$(LIBVALA_LIBS) \
+	$(LIBGEE_LIBS) \
+	$(NULL)
+
+
+EXTRA_DIST = $(libdoclet_la_VALASOURCES)  libdoclet.vala.stamp 
+
+
+MAINTAINERCLEANFILES = \
+	$(libdoclet_la_VALASOURCES:.vala=.c) \
+	$(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/doclet.vala b/src/doclets/devhelp/doclet.vala
similarity index 98%
rename from src/doclets/devhelp/doclet/doclet.vala
rename to src/doclets/devhelp/doclet.vala
index 28c2b60..feb054f 100755
--- a/src/doclets/devhelp/doclet/doclet.vala
+++ b/src/doclets/devhelp/doclet.vala
@@ -24,6 +24,11 @@ using Valadoc.Html;
 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 ) {
@@ -250,7 +255,7 @@ public class Valadoc.Devhelp.Doclet : Valadoc.Html.BasicDoclet {
 
 		var rt = DirUtils.create (path, 0777);
 		rt = DirUtils.create (imgpath, 0777);
-		copy_directory (Config.doclet_path + "deps/", path);
+		copy_directory (doclet_path + "deps/", path);
 
 		this.devhelp = new DevhelpFormat (pkg_name, "");
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index fa67fe4..0578bb5 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -1,10 +1,64 @@
-# src/Makefile.am
-
 NULL =
 
 
-SUBDIRS = \
-          doclet      \
-          $(NULL)
+AM_CFLAGS =  -g \
+	-DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
+	-I ../../libvaladoc/ \
+	-I ../htmlhelpers/doclet/ \
+	$(GLIB_CFLAGS) \
+	$(LIBGEE_CFLAGS) \
+	$(LIBVALA_CFLAGS) \
+	$(NULL)
+
+
+
+BUILT_SOURCES = libdoclet.vala.stamp
+
+
+docletdir = $(libdir)/valadoc/plugins/html//
+
+
+libdoclet_la_LDFLAGS = -module -avoid-version
+
+
+doclet_LTLIBRARIES =  \
+	libdoclet.la      \
+	$(NULL)
+
+
+libdoclet_la_VALASOURCES = \
+	doclet.vala            \
+	$(NULL)
+
+
+libdoclet_la_SOURCES =  \
+	libdoclet.vala.stamp \
+	$(libdoclet_la_VALASOURCES:.vala=.c) \
+	$(NULL)
+
+
+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 . $^
+	touch $@
+
+
+libdoclet_la_LIBADD = \
+	../../libvaladoc/libvaladoc.la \
+	../htmlhelpers/doclet/libhtmlhelpers.la \
+	$(GLIB_LIBS) \
+	$(LIBGEE_LIBS) \
+	$(LIBVALA_LIBS) \
+	$(NULL)
+
+
+EXTRA_DIST = $(libdoclet_la_VALASOURCES)  libdoclet.vala.stamp 
+
+
+MAINTAINERCLEANFILES = \
+	$(libdoclet_la_VALASOURCES:.vala=.c) \
+	$(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/doclet.vala b/src/doclets/htm/doclet.vala
similarity index 97%
rename from src/doclets/htm/doclet/doclet.vala
rename to src/doclets/htm/doclet.vala
index 41df8c4..b6da05f 100755
--- a/src/doclets/htm/doclet/doclet.vala
+++ b/src/doclets/htm/doclet.vala
@@ -23,6 +23,11 @@ using Valadoc.Api;
 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 ) {
@@ -117,7 +122,7 @@ public class Valadoc.HtmlDoclet : Valadoc.Html.BasicDoclet {
 		this.settings = settings;
 
 		DirUtils.create (this.settings.path, 0777);
-		copy_directory (GLib.Path.build_filename ( Config.doclet_path, "deps"), settings.path);
+		copy_directory (GLib.Path.build_filename (doclet_path, "deps"), settings.path);
 
 		write_wiki_pages (tree, css_path_wiki, Path.build_filename(settings.path, "content"));