Rename library to libudisks-2.0.so and provide a pkg-config(1) file

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/configure.ac b/configure.ac
index c4411fc..c7fb6ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -237,6 +237,7 @@ Makefile
 data/Makefile
 data/udisks.pc
 udisks/Makefile
+udisks/udisks-2.0.pc
 src/Makefile
 src/tests/Makefile
 tools/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5ca5f18..ecc12b1 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -42,7 +42,7 @@ INCLUDES = \
 GTKDOC_LIBS =                                  \
        $(GLIB_LIBS)                            \
        $(GIO_LIBS)                             \
-       $(top_builddir)/udisks/libudisks.la     \
+       $(top_builddir)/udisks/libudisks-2.0.la \
        $(top_builddir)/src/libudisks-daemon.la \
        $(NULL)
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 9dfbebd..875045d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,7 +75,7 @@ libudisks_daemon_la_LIBADD =                          \
        $(GUDEV_LIBS)                                   \
        $(LIBATASMART_LIBS)                             \
        $(POLKIT_GOBJECT_1_LIBS)                        \
-       $(top_builddir)/udisks/libudisks.la             \
+       $(top_builddir)/udisks/libudisks-2.0.la         \
        $(NULL)
 
 # ----------------------------------------------------------------------------------------------------

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e47b651..3f143ef 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -30,7 +30,7 @@ udisks_CFLAGS =                                       \
 udisks_LDADD =                                                 \
        $(GLIB_LIBS)                                    \
        $(GIO_LIBS)                                     \
-       $(top_builddir)/udisks/libudisks.la             \
+       $(top_builddir)/udisks/libudisks-2.0.la         \
        $(NULL)
 
 # ----------------------------------------------------------------------------------------------------

diff --git a/udisks/Makefile.am b/udisks/Makefile.am
index d5a211f..ff8f082 100644 (file)
--- a/udisks/Makefile.am
+++ b/udisks/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES = \
        $(GIO_CFLAGS)                                           \
        $(NULL)
 
-generated-bindings.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.UDisks.xml
+$(dbus_built_sources) : Makefile.am $(top_srcdir)/data/org.freedesktop.UDisks.xml
        gdbus-codegen                                                                   \
                --strip-prefix org.freedesktop.UDisks.                                  \
                --namespace UDisks                                                      \
@@ -29,18 +29,22 @@ generated-bindings.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.UDisks
                $(NULL)
 
 udisksenumtypes.h: udisksenums.h udisksenumtypes.h.template
-       ( top_builddir=`cd $(top_builddir) && pwd`; \
-        cd $(srcdir) && glib-mkenums --template udisksenumtypes.h.template udisksenums.h ) | \
-          sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > \
+       ( top_builddir=`cd $(top_builddir) && pwd`;                                             \
+        cd $(srcdir) && glib-mkenums --template udisksenumtypes.h.template udisksenums.h ) |   \
+          sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' >                        \
           udisksenumtypes.h.tmp && mv udisksenumtypes.h.tmp udisksenumtypes.h
 
 udisksenumtypes.c: udisksenums.h udisksenumtypes.c.template
-       ( top_builddir=`cd $(top_builddir) && pwd`; \
-        cd $(srcdir) && glib-mkenums --template udisksenumtypes.c.template udisksenums.h ) | \
-          sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' > \
+       ( top_builddir=`cd $(top_builddir) && pwd`;                                             \
+        cd $(srcdir) && glib-mkenums --template udisksenumtypes.c.template udisksenums.h ) |   \
+          sed 's,U_TYPE_DISKS,UDISKS_TYPE,' | sed 's,u_disks,udisks,' >                        \
           udisksenumtypes.c.tmp && mv udisksenumtypes.c.tmp udisksenumtypes.c
 
-BUILT_SOURCES =                                                                                \
+enum_built_sources =                                                                   \
+       udisksenumtypes.h                       udisksenumtypes.c                       \
+       $(NULL)
+
+dbus_built_sources =                                                                   \
        generated-bindings.stamp                                                        \
        generated-bindings-sections.txt                                                 \
        generated-bindings.types                                                        \
@@ -56,14 +60,18 @@ BUILT_SOURCES =                                                                             \
        generated-udisksjob.h                   generated-udisksjob.c                   \
        generated-udisksproxymanager.h          generated-udisksproxymanager.c          \
        generated-udisksconfigurationitem.h     generated-udisksconfigurationitem.c     \
-       udisksenumtypes.h                       udisksenumtypes.c                       \
        $(NULL)
 
-lib_LTLIBRARIES=libudisks.la
+BUILT_SOURCES =                                                                                \
+       $(enum_built_sources)                                                           \
+       $(dbus_built_sources)                                                           \
+       $(NULL)
+
+lib_LTLIBRARIES=libudisks-2.0.la
 
-libudisksincludedir=$(includedir)/udisks-1.2/udisks
+libudisks_2_0includedir=$(includedir)/udisks-2.0/udisks
 
-libudisksinclude_HEADERS=                                                              \
+libudisks_2_0include_HEADERS=                                                          \
        udisks.h                                                                        \
        udisksenums.h                                                                   \
        udisksenumtypes.h                                                               \
@@ -76,31 +84,37 @@ libudisksinclude_HEADERS=                                                           \
        generated-udisksjob.h                                                           \
        $(NULL)
 
-libudisks_la_SOURCES =                                                                 \
+libudisks_2_0_la_SOURCES =                                                             \
        $(BUILT_SOURCES)                                                                \
        udisksenums.h                                                                   \
        udiskserror.h                           udiskserror.c                           \
        $(NULL)
 
-libudisks_la_CPPFLAGS =                                \
-       -DG_LOG_DOMAIN=\"libudisks\"                    \
+libudisks_2_0_la_CPPFLAGS =                            \
+       -DG_LOG_DOMAIN=\"libudisks-2.0\"                \
        $(NULL)
 
-libudisks_la_CFLAGS =                                  \
+libudisks_2_0_la_CFLAGS =                              \
        $(GLIB_CFLAGS)                                  \
        $(GIO_CFLAGS)                                   \
        $(NULL)
 
-libudisks_la_LIBADD =                                  \
+libudisks_2_0_la_LIBADD =                              \
        $(GLIB_LIBS)                                    \
        $(GIO_LIBS)                                     \
        $(NULL)
 
 # ----------------------------------------------------------------------------------------------------
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = udisks-2.0.pc
+
+# ----------------------------------------------------------------------------------------------------
+
 CLEANFILES =
 
 EXTRA_DIST =                                           \
+       udisks-2.0.pc.in                                \
        $(NULL)
 
 clean-local :

diff --git a/udisks/udisks-2.0.pc.in b/udisks/udisks-2.0.pc.in
new file mode 100644 (file)
index 0000000..27c304a
--- /dev/null
+++ b/udisks/udisks-2.0.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: UDisks Library
+Description: UDisks Client Library
+Version: @VERSION@
+Requires: gio-2.0,gobject-2.0,glib-2.0
+Libs: -L${libdir} -ludisks-2.0
+Cflags: -I${includedir}/udisks-2.0