diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | ccss-cairo-doc/Makefile.am | 2 | ||||
-rw-r--r-- | ccss-cairo-doc/ccss-cairo-docs.sgml | 2 | ||||
-rw-r--r-- | ccss-doc/Makefile.am | 2 | ||||
-rw-r--r-- | ccss-doc/ccss-docs.sgml | 2 | ||||
-rw-r--r-- | ccss-gtk/ccss-gtk-stylesheet.c | 9 | ||||
-rw-r--r-- | configure.in | 2 |
7 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index a6ba255..3cb1b45 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,7 @@ pkgconfig_DATA += ccss-cairo-1.pc endif if CCSS_WITH_GTK -SUBDIRS += ccss-gtk +SUBDIRS += ccss-gtk ccss-gtk-doc pkgconfig_DATA += ccss-gtk-1.pc endif diff --git a/ccss-cairo-doc/Makefile.am b/ccss-cairo-doc/Makefile.am index 09522a0..515f1da 100644 --- a/ccss-cairo-doc/Makefile.am +++ b/ccss-cairo-doc/Makefile.am @@ -42,7 +42,7 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = # -I$(top_srcdir) $(CCSS_CAIRO_CFLAGS) -GTKDOC_LIBS = # $(top_builddir)/ccss/libccss-1.la $(top_builddir)/ccss-caior/libccss-cairo-1.la $(CCSS_LIBS) +GTKDOC_LIBS = # $(CCSS_CAIRO_LIBS) $(top_builddir)/ccss-cairo/libccss-cairo-1.la if GTK_DOC_INSTALLED include $(top_srcdir)/gtk-doc.make diff --git a/ccss-cairo-doc/ccss-cairo-docs.sgml b/ccss-cairo-doc/ccss-cairo-docs.sgml index a7e948f..739a2d5 100644 --- a/ccss-cairo-doc/ccss-cairo-docs.sgml +++ b/ccss-cairo-doc/ccss-cairo-docs.sgml @@ -25,7 +25,7 @@ TODO <part id="dependencies"> <title>CCSS: Dependencies</title> <para> -CCSS depends on the following libraries: +The CCSS/Cairo library depends on the following libraries: <variablelist> <varlistentry> diff --git a/ccss-doc/Makefile.am b/ccss-doc/Makefile.am index 270c534..c951907 100644 --- a/ccss-doc/Makefile.am +++ b/ccss-doc/Makefile.am @@ -42,7 +42,7 @@ extra_files = # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. GTKDOC_CFLAGS = # -I$(top_srcdir) $(CCSS_CFLAGS) -GTKDOC_LIBS = # $(top_builddir)/libccss/ccss/libccss.la $(CCSS_LIBS) +GTKDOC_LIBS = # $(CCSS_LIBS) $(top_builddir)/libccss/ccss/libccss.la if GTK_DOC_INSTALLED include $(top_srcdir)/gtk-doc.make diff --git a/ccss-doc/ccss-docs.sgml b/ccss-doc/ccss-docs.sgml index c8f8fb1..5fa6ddc 100644 --- a/ccss-doc/ccss-docs.sgml +++ b/ccss-doc/ccss-docs.sgml @@ -30,7 +30,7 @@ TODO <part id="dependencies"> <title>CCSS: Dependencies</title> <para> -CCSS depends on the following libraries: +The CCSS library depends on the following libraries: <variablelist> <varlistentry> diff --git a/ccss-gtk/ccss-gtk-stylesheet.c b/ccss-gtk/ccss-gtk-stylesheet.c index a76105d..2532285 100644 --- a/ccss-gtk/ccss-gtk-stylesheet.c +++ b/ccss-gtk/ccss-gtk-stylesheet.c @@ -484,6 +484,15 @@ iter_func (ccss_stylesheet_t *stylesheet, } } +/** + * ccss_gtk_stylesheet_to_gtkrc: + * @self: a #ccss_stylesheet_t. + * + * Convert a stylesheet to a gtkrc string. CSS and gtkrc do not match one to + * one onto each other so this is a best effort conversion. + * + * Returns: a gtkrc string. + */ char * ccss_gtk_stylesheet_to_gtkrc (ccss_stylesheet_t *self) { diff --git a/configure.in b/configure.in index e6c4020..bf8011b 100644 --- a/configure.in +++ b/configure.in @@ -344,6 +344,8 @@ AC_CONFIG_FILES([ ccss-gtk-1.pc ccss-gtk/Makefile + ccss-gtk-doc/Makefile + ccss-gtk-doc/version.xml examples/Makefile ]) |