Use 'ccss' name consistently, drop 'lib' prefix where possible.

9 files changed, 23 insertions, 21 deletions

diff --git a/Makefile.am b/Makefile.am
index cdc241f..a6ba255 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,16 +25,16 @@ SUBDIRS += ccss-tests
 endif
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libccss-1.pc
+pkgconfig_DATA = ccss-1.pc
 
 if CCSS_WITH_CAIRO
 SUBDIRS += ccss-cairo ccss-cairo-doc
-pkgconfig_DATA += libccss-cairo-1.pc
+pkgconfig_DATA += ccss-cairo-1.pc
 endif
 
 if CCSS_WITH_GTK
 SUBDIRS += ccss-gtk
-pkgconfig_DATA += libccss-gtk-1.pc
+pkgconfig_DATA += ccss-gtk-1.pc
 endif
 
 if CCSS_WITH_EXAMPLES
@@ -50,9 +50,9 @@ EXTRA_DIST = \
 	README \
 	TODO \
 	autogen.sh \
-	libccss-1.pc.in \
-	libccss-cairo-1.pc.in \
-	libccss-gtk-1.pc.in \
+	ccss-1.pc.in \
+	ccss-cairo-1.pc.in \
+	ccss-gtk-1.pc.in \
 	$(NULL)
 
 CLEANFILES = \
diff --git a/NEWS b/NEWS
index 876ea7e..6cf464e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 NEWS
 ====
 
+* Use 'ccss' name consistently, drop 'lib' prefix where possible.
+
 Core
 * Deep-free properties when destroying a stylesheet, fixes memory leak.
 * New ccss_style_hash() value can be used to compare styles for equality.
diff --git a/libccss-1.pc.in b/ccss-1.pc.in
index d79dc71..1ebd14d 100644
--- a/libccss-1.pc.in
+++ b/ccss-1.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libccss-1
+Name: ccss-1
 Description: The Cairo CSS Library
 Version: @VERSION@
 Requires: @CCSS_DEPS@
 Libs: -L${libdir} -lccss-1
-Cflags: -I${includedir}/libccss-1
+Cflags: -I${includedir}/ccss-1
 
diff --git a/libccss-cairo-1.pc.in b/ccss-cairo-1.pc.in
index a0392ba..33799b9 100644
--- a/libccss-cairo-1.pc.in
+++ b/ccss-cairo-1.pc.in
@@ -8,10 +8,10 @@ ccss_with_soup=@ccss_with_soup@
 ccss_cairo_appearance_module_interface_version=@CCSS_CAIRO_APPEARANCE_MODULE_INTERFACE_VERSION@
 ccss_cairo_appearance_module_path=@CCSS_CAIRO_APPEARANCE_MODULE_PATH@
 
-Name: libccss-cairo-1
+Name: ccss-cairo-1
 Description: The Cairo CSS Library
 Version: @VERSION@
 Requires: @CCSS_CAIRO_DEPS@
 Libs: -L${libdir} -lccss-cairo-1
-Cflags: -I${includedir}/libccss-1
+Cflags: -I${includedir}/ccss-1
 
diff --git a/ccss-cairo/Makefile.am b/ccss-cairo/Makefile.am
index 73d3fe1..578e50a 100644
--- a/ccss-cairo/Makefile.am
+++ b/ccss-cairo/Makefile.am
@@ -49,7 +49,7 @@ libccss_cairo_1_la_SOURCES = \
 	ccss-cairo-style.h \
 	$(NULL)
 
-headersdir = $(includedir)/libccss-1/ccss-cairo
+headersdir = $(includedir)/ccss-1/ccss-cairo
 
 headers_DATA = \
 	ccss-cairo.h \
diff --git a/libccss-gtk-1.pc.in b/ccss-gtk-1.pc.in
index 6df1f96..a7054b7 100644
--- a/libccss-gtk-1.pc.in
+++ b/ccss-gtk-1.pc.in
@@ -3,10 +3,10 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: libccss-gtk-1
+Name: ccss-gtk-1
 Description: The Gtk+ CSS Library
 Version: @VERSION@
 Requires: @CCSS_GTK_DEPS@
 Libs: -L${libdir} -lccss-gtk-1
-Cflags: -I${includedir}/libccss-1
+Cflags: -I${includedir}/ccss-1
 
diff --git a/ccss-gtk/Makefile.am b/ccss-gtk/Makefile.am
index 8b8c08b..c289a8c 100644
--- a/ccss-gtk/Makefile.am
+++ b/ccss-gtk/Makefile.am
@@ -38,7 +38,7 @@ libccss_gtk_1_la_SOURCES = \
 	ccss-gtk-stylesheet.c \
 	$(NULL)
 
-headersdir = $(includedir)/libccss-1/ccss-gtk
+headersdir = $(includedir)/ccss-1/ccss-gtk
 
 headers_DATA = \
 	ccss-gtk.h \
diff --git a/ccss/Makefile.am b/ccss/Makefile.am
index f674e69..545520a 100644
--- a/ccss/Makefile.am
+++ b/ccss/Makefile.am
@@ -58,7 +58,7 @@ libccss_1_la_SOURCES = \
 	ccss-stylesheet-priv.h \
 	$(NULL)
 
-headersdir = $(includedir)/libccss-1/ccss
+headersdir = $(includedir)/ccss-1/ccss
 
 headers_DATA = \
 	ccss-background.h \
diff --git a/configure.in b/configure.in
index 15fe81f..e6c4020 100644
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ m4_define([ccss_version],
 
 m4_define([ccss_cairo_appearance_module_interface_version], [0.4])
 
-AC_INIT([libccss], [ccss_version])
+AC_INIT([ccss], [ccss_version])
 AC_CONFIG_AUX_DIR([build])
 AC_CONFIG_MACRO_DIR([build])
 AC_CONFIG_HEADERS([config.h])
@@ -201,7 +201,7 @@ fi
 # AC_SUBST([CCSS_CAIRO_CFLAGS]) # set further down
 CCSS_CAIRO_LIBS="${CCSS_CAIRO_LIBS} "'$(top_builddir)/ccss/libccss-1.la'
 AC_SUBST([CCSS_CAIRO_LIBS])
-AC_SUBST([CCSS_CAIRO_DEPS], "$ccss_cairo_pkgs libccss-1")
+AC_SUBST([CCSS_CAIRO_DEPS], "$ccss_cairo_pkgs ccss-1")
 
 CCSS_CAIRO_APPEARANCE_MODULE_INTERFACE_VERSION=ccss_cairo_appearance_module_interface_version
 AC_SUBST([CCSS_CAIRO_APPEARANCE_MODULE_INTERFACE_VERSION])
@@ -238,7 +238,7 @@ fi
 # AC_SUBST([CCSS_GTK_CFLAGS]) # set further down
 CCSS_GTK_LIBS="${CCSS_GTK_LIBS} "'$(top_builddir)/ccss/libccss-1.la $(top_builddir)/ccss-cairo/libccss-cairo-1.la'
 AC_SUBST([CCSS_GTK_LIBS])
-AC_SUBST([CCSS_GTK_DEPS], "$ccss_gtk_reqs libccss-cairo-1")
+AC_SUBST([CCSS_GTK_DEPS], "$ccss_gtk_reqs ccss-cairo-1")
 
 
 ### examples ###
@@ -331,18 +331,18 @@ AC_CONFIG_FILES([
   build/shave
   build/shave-libtool
 
-  libccss-1.pc
+  ccss-1.pc
   ccss/Makefile
   ccss-doc/Makefile
   ccss-doc/version.xml
   ccss-tests/Makefile
 
-  libccss-cairo-1.pc
+  ccss-cairo-1.pc
   ccss-cairo/Makefile
   ccss-cairo-doc/Makefile
   ccss-cairo-doc/version.xml
 
-  libccss-gtk-1.pc
+  ccss-gtk-1.pc
   ccss-gtk/Makefile
 
   examples/Makefile