[valadoc] - libhtml >> libdoclet

[Florian Brosch <flobrosch src gnome org>]

commit 5f97cf3cc3d6fd731c1777a369bbc005d24eca4d
Author: Florian Brosch <flo brosch gmail com>
Date:   Thu Sep 17 00:31:21 2009 +0200

    - libhtml >> libdoclet

 configure.in                                       |    1 -
 src/doclets/htmlhelpers/Makefile.am                |    1 -
 src/doclets/htmlhelpers/html/Makefile.am           |   55 --------------------
 src/doclets/htmlhelpers/languages/Makefile.am      |   20 +++----
 src/doclets/valadoc.org/doclet/Makefile.am         |   11 +---
 .../doclet/{template.vala => doclet.vala}          |    0
 src/libvaladoc/Makefile.am                         |    4 ++
 .../htmlhelpers => libvaladoc}/html/attribute.vala |    0
 .../htmlhelpers => libvaladoc}/html/block.vala     |    0
 .../html/htmlwriter.vala                           |    0
 .../htmlhelpers => libvaladoc}/html/inline.vala    |    0
 11 files changed, 16 insertions(+), 76 deletions(-)
---
diff --git a/configure.in b/configure.in
index eb36a2d..fd7cccd 100644
--- a/configure.in
+++ b/configure.in
@@ -63,7 +63,6 @@ AC_CONFIG_FILES([Makefile
                  src/doclets/Makefile
                  src/doclets/htmlhelpers/Makefile
                  src/doclets/htmlhelpers/deps/Makefile
-                 src/doclets/htmlhelpers/html/Makefile
                  src/doclets/htmlhelpers/languages/Makefile
                  src/doclets/htmlhelpers/doclet/Makefile
                  src/doclets/htmlhelpers/taglets/Makefile
diff --git a/src/doclets/htmlhelpers/Makefile.am b/src/doclets/htmlhelpers/Makefile.am
index 10df173..ca54da1 100644
--- a/src/doclets/htmlhelpers/Makefile.am
+++ b/src/doclets/htmlhelpers/Makefile.am
@@ -2,7 +2,6 @@ NULL =
 
 
 SUBDIRS =     \
-	html      \
 	languages \
 	doclet    \
 	taglets   \
diff --git a/src/doclets/htmlhelpers/languages/Makefile.am b/src/doclets/htmlhelpers/languages/Makefile.am
index 398160e..8a9b287 100644
--- a/src/doclets/htmlhelpers/languages/Makefile.am
+++ b/src/doclets/htmlhelpers/languages/Makefile.am
@@ -1,11 +1,10 @@
 NULL =
 
 
-AM_CFLAGS =  -g                  \
-	-I ../../../libvaladoc/      \
-	-I ../html/                  \
-	$(GLIB_CFLAGS)               \
-	$(LIBVALA_CFLAGS)            \
+AM_CFLAGS =  -g \
+	-I ../../../libvaladoc/ \
+	$(GLIB_CFLAGS) \
+	$(LIBVALA_CFLAGS) \
 	$(NULL)
 
 
@@ -32,19 +31,18 @@ libapiwriter_la_SOURCES =                   \
 
 
 libapiwriter.vala.stamp: $(libapiwriter_la_VALASOURCES)
-	$(VALAC) -C --vapidir ../../../vapi --pkg valadoc-1.0 --vapidir ../html/ --pkg htmlwriter-1.0 --basedir . --save-temps -H apiwriter-1.0.h --library apiwriter-1.0 $^
+	$(VALAC) -C --vapidir ../../../vapi --pkg valadoc-1.0 --basedir . --save-temps -H apiwriter-1.0.h --library apiwriter-1.0 $^
 	touch $@
 
 
 libapiwriter_la_LDFLAGS = -module -avoid-version
 
 
-libapiwriter_la_LIBADD =                 \
+libapiwriter_la_LIBADD = \
 	../../../libvaladoc/libvaladoc.la \
-	../html/libhtmlwriter.la                \
-	$(LIBGVC_LIBS)                       \
-	$(LIBVALA_LIBS)                      \
-	$(GLIB_LIBS)                         \
+	$(LIBGVC_LIBS) \
+	$(LIBVALA_LIBS) \
+	$(GLIB_LIBS) \
 	$(NULL)
 
 
diff --git a/src/doclets/valadoc.org/doclet/Makefile.am b/src/doclets/valadoc.org/doclet/Makefile.am
index 965a704..d4afe91 100755
--- a/src/doclets/valadoc.org/doclet/Makefile.am
+++ b/src/doclets/valadoc.org/doclet/Makefile.am
@@ -1,10 +1,8 @@
 # src/Makefile.am
 
 
-
-
 libdoclet_VALASOURCES = \
-	template.vala       \
+	doclet.vala \
 	$(NULL)
 
 
@@ -12,7 +10,7 @@ BUILT_SOURCES = libdoclet.vala.stamp
 
 
 libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
-	$(VALAC) -C --vapidir ../../htmlhelpers/html/ --pkg htmlwriter-1.0 --vapidir ../../htmlhelpers/languages/ --pkg apiwriter-1.0 --vapidir ../../../vapi/ --pkg valadoc-1.0 --basedir . --save-temps $^
+	$(VALAC) -C --vapidir ../../htmlhelpers/languages/ --pkg apiwriter-1.0 --vapidir ../../../vapi/ --pkg valadoc-1.0 --basedir . --save-temps $^
 	touch $@
 
 
@@ -20,6 +18,7 @@ libdoclet.vala.stamp: $(libdoclet_VALASOURCES)
 
 docletdir = $(libdir)/valadoc/plugins/valadoc.org/
 
+
 doclet_LTLIBRARIES = libdoclet.la
 
 
@@ -33,7 +32,6 @@ libdoclet_la_SOURCES =                \
 
 AM_CFLAGS =  -g                    \
 	-I ../../../libvaladoc/        \
-	-I ../../htmlhelpers/html      \
 	-I ../../htmlhelpers/languages \
 	`mysql_config --cflags`        \
 	$(GLIB_CFLAGS)                 \
@@ -48,13 +46,10 @@ libdoclet_la_LDFLAGS = -module -avoid-version \
 
 libdoclet_la_LIBADD =                           \
 	../../../libvaladoc/libvaladoc.la           \
-	../../htmlhelpers/html/libhtmlwriter.la     \
 	../../htmlhelpers/languages/libapiwriter.la \
 	$(GLIB_LIBS)                                \
 	$(LIBVALA_LIBS)                             \
 	$(NULL)
 
 
-
-
 EXTRA_DIST = $(libdoclet_VALASOURCES)  libdoclet.vala.stamp 
diff --git a/src/doclets/valadoc.org/doclet/template.vala b/src/doclets/valadoc.org/doclet/doclet.vala
similarity index 100%
rename from src/doclets/valadoc.org/doclet/template.vala
rename to src/doclets/valadoc.org/doclet/doclet.vala
diff --git a/src/libvaladoc/Makefile.am b/src/libvaladoc/Makefile.am
index 175ae37..fd49a00 100644
--- a/src/libvaladoc/Makefile.am
+++ b/src/libvaladoc/Makefile.am
@@ -74,6 +74,10 @@ libvaladoc_la_VALASOURCES = \
 	apitree/typeparameter.vala \
 	apitree/typereference.vala \
 	apitree/visitable.vala \
+	html/attribute.vala \
+	html/block.vala \
+	html/htmlwriter.vala \
+	html/inline.vala \
 	$(NULL)
 
 
diff --git a/src/doclets/htmlhelpers/html/attribute.vala b/src/libvaladoc/html/attribute.vala
similarity index 100%
rename from src/doclets/htmlhelpers/html/attribute.vala
rename to src/libvaladoc/html/attribute.vala
diff --git a/src/doclets/htmlhelpers/html/block.vala b/src/libvaladoc/html/block.vala
similarity index 100%
rename from src/doclets/htmlhelpers/html/block.vala
rename to src/libvaladoc/html/block.vala
diff --git a/src/doclets/htmlhelpers/html/htmlwriter.vala b/src/libvaladoc/html/htmlwriter.vala
similarity index 100%
rename from src/doclets/htmlhelpers/html/htmlwriter.vala
rename to src/libvaladoc/html/htmlwriter.vala
diff --git a/src/doclets/htmlhelpers/html/inline.vala b/src/libvaladoc/html/inline.vala
similarity index 100%
rename from src/doclets/htmlhelpers/html/inline.vala
rename to src/libvaladoc/html/inline.vala