Hello,
Attached is a patch that renames libtidy to libclutter-tidy.
The rationale for this is that there is already a libtidy, so building a
package with a shared object can conflict.
The other libtidy currently produces libtidy-0.99.so.0, so it stands to
reason that there will soon be a libtidy-1.0.so.0.
It would be very nice if every user of the tidy library didn't have to
rename it.
--Pat
diff --git a/Makefile.am b/Makefile.am
index 393d7f8..f1546c2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,14 @@
SUBDIRS = tidy tests docs contrib
-pcfiles = tidy-1.0.pc
+pcfiles = clutter-tidy-1.0.pc
-tidy-1.0.pc: tidy.pc
+clutter-tidy-1.0.pc: clutter-tidy.pc
@cp -f $< $@
pkgconfig_DATA = $(pcfiles)
pkgconfigdir = $(libdir)/pkgconfig
-EXTRA_DIST = tidy.pc.in
+EXTRA_DIST = clutter-tidy.pc.in
CLEANFILES = $(pcfiles)
diff --git a/configure.ac b/configure.ac
index bae91ca..bfc6a5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,7 +122,7 @@ AC_CONFIG_FILES([
docs/reference/Makefile
docs/reference/version.xml
contrib/Makefile
- tidy.pc
+ clutter-tidy.pc
])
AC_OUTPUT
diff --git a/tidy.pc.in b/tidy.pc.in
deleted file mode 100644
index da8c99a..0000000
--- a/tidy.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-pref...@prefix@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
-
-Name: Tidy
-Description: Actors collections for Clutter
-Version: @VERSION@
-Libs: -L${libdir} -ltidy-1.0
-Cflags: -I${includedir}/tidy-1.0
-Requires: gobject-2.0 clutter-0.8
diff --git a/tidy/Makefile.am b/tidy/Makefile.am
index b9b0786..cc082d3 100644
--- a/tidy/Makefile.am
+++ b/tidy/Makefile.am
@@ -130,18 +130,18 @@ tidy-enum-types.c: stamp-tidy-enum-types.h tidy-enum-types.c.in
cp xgen-tetc tidy-enum-types.c && \
rm -f xgen-tetc
-lib_LTLIBRARIES = libtidy-1.0.la
+lib_LTLIBRARIES = libclutter-tidy-1.0.la
-libtidy_1_0_la_LIBADD = $(TIDY_LIBS)
-libtidy_1_0_la_SOURCES = \
+libclutter_tidy_1_0_la_LIBADD = $(TIDY_LIBS)
+libclutter_tidy_1_0_la_SOURCES = \
$(source_c) \
$(source_h) \
$(source_h_priv) \
$(BUILT_SOURCES) \
$(NULL)
-libtidy_1_0_la_LDFLAGS = $(LDADD)
+libclutter_tidy_1_0_la_LDFLAGS = $(LDADD)
-tidyincludedir = $(includedir)/tidy-1.0/tidy
+tidyincludedir = $(includedir)/clutter-tidy-1.0/tidy
tidyinclude_DATA = \
$(source_h) \
$(top_builddir)/tidy/tidy-enum-types.h \
diff --git a/clutter-tidy.pc.in b/clutter-tidy.pc.in
new file mode 100644
index 0000000..027daf1
--- /dev/null
+++ b/clutter-tidy.pc.in
@@ -0,0 +1,11 @@
+pref...@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${exec_prefix}/include
+
+Name: Tidy
+Description: Actors collections for Clutter
+Version: @VERSION@
+Libs: -L${libdir} -lclutter-tidy-1.0
+Cflags: -I${includedir}/clutter-tidy-1.0
+Requires: gobject-2.0 clutter-0.8
