- libhtml >> libdoclet

diff --git a/configure.in b/configure.in
index eb36a2dae01a589f0776047479b949dde368d20d..fd7cccd1ac3e2f0c29190ff8559087068b9b9665 100644 (file)
--- 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 10df17349d00c96b0ca54361362b982ecba204f6..ca54da1b0182d6b1845fee904ef38619537e1d25 100644 (file)
--- 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/html/Makefile.am b/src/doclets/htmlhelpers/html/Makefile.am
deleted file mode 100644 (file)
index f0e283d..0000000
--- a/src/doclets/htmlhelpers/html/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-NULL =
-
-
-AM_CFLAGS =  -g                  \
-       $(GLIB_CFLAGS)               \
-       $(LIBVALA_CFLAGS)            \
-       $(NULL)
-
-
-BUILT_SOURCES = libhtmlwriter.vala.stamp
-
-
-htmlwriterdir = $(libdir)/valadoc/plugins/htmlhelpers/
-
-
-htmlwriter_LTLIBRARIES = \
-       libhtmlwriter.la     \
-       $(NULL)
-
-
-libhtmlwriter_la_VALASOURCES = \
-       htmlwriter.vala \
-       attribute.vala  \
-       block.vala      \
-       inline.vala     \
-       $(NULL)
-
-
-libhtmlwriter_la_SOURCES =                   \
-       libhtmlwriter.vala.stamp                 \
-       $(libhtmlwriter_la_VALASOURCES:.vala=.c) \
-       $(NULL)
-
-
-libhtmlwriter.vala.stamp: $(libhtmlwriter_la_VALASOURCES)
-       $(VALAC) -C --pkg vala-1.0 --basedir . --save-temps --library htmlwriter-1.0 -H htmlwriter-1.0.h $^
-       touch $@
-
-
-libhtmlwriter_la_LDFLAGS = $(NULL)
-
-
-libhtmlwriter_la_LIBADD =            \
-       $(GLIB_LIBS)                     \
-       $(LIBVALA_LIBS)                  \
-       $(NULL)
-
-
-EXTRA_DIST = $(libhtmlwriter_la_VALASOURCES)  libhtmlwriter.vala.stamp 
-
-
-MAINTAINERCLEANFILES =                           \
-       $(libhtmlwriter_la_VALASOURCES:.vala=.c) \
-       $(NULL)
-

diff --git a/src/doclets/htmlhelpers/languages/Makefile.am b/src/doclets/htmlhelpers/languages/Makefile.am
index 398160e4b2728e829489b72e9b8a777ab8e65b49..8a9b287f916331895558f5421bfe3312be9c741d 100644 (file)
--- 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 965a7044217d6c1df0c3f6e8536f6ce5c5f40b42..d4afe919c81c310c985ee15f69241a918fc0ddd7 100755 (executable)
--- 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 175ae3749ca375132313e9753d07409c611bd365..fd49a00336051f2f5ba2b24d16f7a71d8bd613f7 100644 (file)
--- 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