rm of conditional doclet directories

diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index 47c7e60da99cdbd69d6906c65748e3441a3503c5..7e89413328c26ecf4bccd55c252b6c5ec074aae5 100644 (file)
--- 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 28c2b605255ce18f3e8febb6a448221b8404c1c3..feb054ff5c21ca8f47c2a26ff94f7c0f1fc9792d 100755 (executable)
--- 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/devhelp/doclet/Makefile.am b/src/doclets/devhelp/doclet/Makefile.am
deleted file mode 100644 (file)
index d287899..0000000
--- a/src/doclets/devhelp/doclet/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-NULL =
-
-
-AM_CFLAGS =  -g                                             \
-       -DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
-       -I ../../../libvaladoc/                                 \
-       -I ../../htmlhelpers/doclet/                            \
-       -I ../                                                  \
-       $(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 --vapidir . --pkg docletconfig --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/docletconfig.vapi b/src/doclets/devhelp/doclet/docletconfig.vapi
deleted file mode 100644 (file)
index c791c1f..0000000
--- a/src/doclets/devhelp/doclet/docletconfig.vapi
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "")]
-namespace Config {
-       [CCode (cname = "PACKAGE_PLUGINDIR")]
-       public const string doclet_path;
-}

diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index fa67fe40954d490135a6b10fe3754da468969a49..0578bb503f33dae9da75b222c416b8e70628c9f2 100644 (file)
--- 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 41df8c4bcc00590b054ad1c8dd2e2c89159c6cdd..b6da05f60c91b4d544e652ec53a3dd8ae1aa1177 100755 (executable)
--- 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"));
 

diff --git a/src/doclets/htm/doclet/Makefile.am b/src/doclets/htm/doclet/Makefile.am
deleted file mode 100644 (file)
index 9817f50..0000000
--- a/src/doclets/htm/doclet/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-NULL =
-
-
-AM_CFLAGS =  -g                                             \
-       -DPACKAGE_PLUGINDIR=\"$(libdir)/valadoc/plugins/html/\" \
-       -I ../../../libvaladoc/                                 \
-       -I ../../htmlhelpers/doclet/                            \
-       -I ../                                                  \
-       $(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 --vapidir . --pkg docletconfig --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/docletconfig.vapi b/src/doclets/htm/doclet/docletconfig.vapi
deleted file mode 100644 (file)
index c791c1f..0000000
--- a/src/doclets/htm/doclet/docletconfig.vapi
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "")]
-namespace Config {
-       [CCode (cname = "PACKAGE_PLUGINDIR")]
-       public const string doclet_path;
-}