fix up naming snafu and add .pc file

18 files changed, 56 insertions, 41 deletions

diff --git a/configure.ac b/configure.ac
index 6925f7d..0175b93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,9 +169,10 @@ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
 AC_OUTPUT([
 Makefile
 data/Makefile
+data/xdg-hostname-gobject-1.pc
 policy/Makefile
 src/Makefile
-src/xdghostname/Makefile
+src/xdg-hostname/Makefile
 src/daemon/Makefile
 src/programs/Makefile
 docs/version.xml
diff --git a/data/Makefile.am b/data/Makefile.am
index beec0cf..7033fa3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -16,7 +16,10 @@ $(dbusconf_DATA): $(dbusconf_in_files) Makefile
 
 #	@sed -e "s|\@polkituser\@|$(POLKIT_USER)|" $< > $@
 
-CLEANFILES = $(BUILT_SOURCES)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = xdg-hostname-gobject-1.pc
+
+CLEANFILES = $(BUILT_SOURCES) $(pkgconfig_DATA)
 
 EXTRA_DIST = org.freedesktop.Hostname1.xml $(service_in_files) $(dbusconf_in_files)
 
diff --git a/data/xdg-hostname-gobject-1.pc.in b/data/xdg-hostname-gobject-1.pc.in
new file mode 100644
index 0000000..7a0bf99
--- /dev/null
+++ b/data/xdg-hostname-gobject-1.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xdg-hostname-gobject-1
+Description: GObject library for accessing the xdg-hostname daemon
+Version: @VERSION@
+Requires: gobject-2.0 gio-2.0
+Libs: -L${libdir} -lxdg-hostname-gobject-1
+Cflags: -I${includedir}/xdghostname-1
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 43633ef..e95ccdf 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -15,11 +15,11 @@ DOC_MAIN_SGML_FILE=xdg-hostname-docs.xml
 SCAN_OPTIONS=--ignore-headers=config.h
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../src/xdghostname
+DOC_SOURCE_DIR=../src/xdg-hostname
 
 # Used for dependencies
-HFILE_GLOB=$(top_srcdir)/src/xdghostname/*.h
-CFILE_GLOB=$(top_srcdir)/src/xdghostname/*.c
+HFILE_GLOB=$(top_srcdir)/src/xdg-hostname/*.h
+CFILE_GLOB=$(top_srcdir)/src/xdg-hostname/*.c
 
 # Headers to ignore
 IGNORE_HFILES= \
@@ -31,15 +31,15 @@ INCLUDES = \
 	$(DBUS_GLIB_CFLAGS)						\
 	$(GLIB_CFLAGS)							\
 	$(GIO_CFLAGS)							\
-	-I$(top_srcdir)/src/xdghostname 				\
-	-I$(top_builddir)/src/xdghostname				\
+	-I$(top_srcdir)/src/xdg-hostname 				\
+	-I$(top_builddir)/src/xdg-hostname				\
 	$(NULL)
 
 GTKDOC_LIBS = \
 	$(DBUS_GLIB_LIBS)						\
 	$(GLIB_LIBS)							\
 	$(GIO_LIBS)							\
-	$(top_builddir)/src/xdghostname/libxdg-hostname-gobject-1.la	\
+	$(top_builddir)/src/xdg-hostname/libxdg-hostname-gobject-1.la	\
 	$(NULL)
 
 # Extra options to supply to gtkdoc-mkdb
diff --git a/docs/xdg-hostname-docs.xml b/docs/xdg-hostname-docs.xml
index 52d5f5c..64ba039 100644
--- a/docs/xdg-hostname-docs.xml
+++ b/docs/xdg-hostname-docs.xml
@@ -455,8 +455,8 @@ xdg-hostname-1 --set-hostname `/bin/hostname`
         <literal>xdg-hostname</literal> project.
       </para>
     </partintro>
-    <xi:include href="xml/xdghostnamemonitor.xml"/>
-    <xi:include href="xml/xdghostnameerror.xml"/>
+    <xi:include href="xml/xdg-hostname-monitor.xml"/>
+    <xi:include href="xml/xdg-hostname-error.xml"/>
   </reference>
 
   <reference id="ref-tools">
diff --git a/src/Makefile.am b/src/Makefile.am
index 879c664..ad5b9c4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-SUBDIRS = xdghostname daemon programs
+SUBDIRS = xdg-hostname daemon programs
 
 clean-local :
 	rm -f *~
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index a43703c..40f958a 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -15,17 +15,17 @@ INCLUDES =                                              	\
 	$(NULL)
 
 BUILT_SOURCES =							\
-        xdghostnamedaemonglue.h					\
+        xdg-hostname-daemon-glue.h				\
         $(NULL)
 
-xdghostnamedaemonglue.h: $(top_srcdir)/data/org.freedesktop.Hostname1.xml Makefile.am
-	dbus-binding-tool --prefix=_xdg_hostname_daemon --mode=glib-server --output=xdghostnamedaemonglue.h $(top_srcdir)/data/org.freedesktop.Hostname1.xml
+xdg-hostname-daemon-glue.h: $(top_srcdir)/data/org.freedesktop.Hostname1.xml Makefile.am
+	dbus-binding-tool --prefix=_xdg_hostname_daemon --mode=glib-server --output=xdg-hostname-daemon-glue.h $(top_srcdir)/data/org.freedesktop.Hostname1.xml
 
 libexec_PROGRAMS = xdg-hostname-daemon-1
 
 xdg_hostname_daemon_1_SOURCES = 				\
 	main.c							\
-	xdghostnamedaemon.c	xdghostnamedaemon.h		\
+	xdg-hostname-daemon.c	xdg-hostname-daemon.h		\
 	$(NULL)
 
 xdg_hostname_daemon_1_CFLAGS = 					\
@@ -42,7 +42,7 @@ xdg_hostname_daemon_1_LDADD = 				      		\
 	$(GLIB_LIBS)							\
 	$(GIO_LIBS)							\
 	$(POLKIT_LIBS)							\
-	$(top_builddir)/src/xdghostname/libxdg-hostname-gobject-1.la	\
+	$(top_builddir)/src/xdg-hostname/libxdg-hostname-gobject-1.la	\
 	$(NULL)
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 34f8dc0..2ce3c53 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -46,7 +46,7 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "xdghostnamedaemon.h"
+#include "xdg-hostname-daemon.h"
 
 #define NAME_TO_CLAIM "org.freedesktop.Hostname1"
 
diff --git a/src/daemon/xdghostnamedaemon.c b/src/daemon/xdg-hostname-daemon.c
index 6877ff7..76d0a1e 100644
--- a/src/daemon/xdghostnamedaemon.c
+++ b/src/daemon/xdg-hostname-daemon.c
@@ -35,9 +35,9 @@
 
 #include <polkit-dbus/polkit-dbus.h>
 
-#include <xdghostname/xdghostname.h>
+#include <xdg-hostname/xdg-hostname.h>
 
-#include "xdghostnamedaemon.h"
+#include "xdg-hostname-daemon.h"
 
 struct _XdgHostnameDaemon
 {
@@ -156,7 +156,7 @@ static gboolean _xdg_hostname_daemon_unregister_transient_data_provider (XdgHost
                                                                          const char             *cookie,
                                                                          DBusGMethodInvocation  *context);
 
-#include "xdghostnamedaemonglue.h"
+#include "xdg-hostname-daemon-glue.h"
 
 /*--------------------------------------------------------------------------------------------------------------*/
 
diff --git a/src/daemon/xdghostnamedaemon.h b/src/daemon/xdg-hostname-daemon.h
index a050fe4..a050fe4 100644
--- a/src/daemon/xdghostnamedaemon.h
+++ b/src/daemon/xdg-hostname-daemon.h
diff --git a/src/programs/Makefile.am b/src/programs/Makefile.am
index c9337f4..cd0d4e3 100644
--- a/src/programs/Makefile.am
+++ b/src/programs/Makefile.am
@@ -31,7 +31,7 @@ xdg_hostname_1_LDADD =  	                      			\
 	$(GIO_LIBS)							\
 	$(DBUS_GLIB_LIBS)						\
 	$(POLKIT_LIBS)							\
-	$(top_builddir)/src/xdghostname/libxdg-hostname-gobject-1.la	\
+	$(top_builddir)/src/xdg-hostname/libxdg-hostname-gobject-1.la	\
 	$(NULL)
 
 clean-local:
diff --git a/src/programs/xdg-hostname.c b/src/programs/xdg-hostname.c
index 8401d66..c02e2d0 100644
--- a/src/programs/xdg-hostname.c
+++ b/src/programs/xdg-hostname.c
@@ -28,7 +28,7 @@
 #include <dbus/dbus-glib-lowlevel.h>
 #include <polkit-dbus/polkit-dbus.h>
 
-#include <xdghostname/xdghostname.h>
+#include <xdg-hostname/xdg-hostname.h>
 
 static gboolean opt_show;
 static gboolean opt_monitor;
diff --git a/src/xdghostname/Makefile.am b/src/xdg-hostname/Makefile.am
index 8a48988..f1a7493 100644
--- a/src/xdghostname/Makefile.am
+++ b/src/xdg-hostname/Makefile.am
@@ -16,26 +16,26 @@ INCLUDES =                                                      \
         $(NULL)
 
 BUILT_SOURCES =							\
-        xdghostnameclientglue.h					\
+        xdg-hostname-client-glue.h				\
         $(NULL)
 
-xdghostnameclientglue.h: $(top_srcdir)/data/org.freedesktop.Hostname1.xml Makefile.am
-	dbus-binding-tool --mode=glib-client --output=xdghostnameclientglue.h $(top_srcdir)/data/org.freedesktop.Hostname1.xml
+xdg-hostname-client-glue.h: $(top_srcdir)/data/org.freedesktop.Hostname1.xml Makefile.am
+	dbus-binding-tool --mode=glib-client --output=xdg-hostname-client-glue.h $(top_srcdir)/data/org.freedesktop.Hostname1.xml
 
 lib_LTLIBRARIES=libxdg-hostname-gobject-1.la
 
-libxdg_hostname_gobject_1includedir=$(includedir)/xdghostname-1/xdghostname
+libxdg_hostname_gobject_1includedir=$(includedir)/xd-hostname-gobject-1/xdg-hostname
 
 libxdg_hostname_gobject_1include_HEADERS =                        	\
-        xdghostname.h							\
-        xdghostnameerror.h						\
-        xdghostnamemonitor.h						\
+        xdg-hostname.h							\
+        xdg-hostname-error.h						\
+        xdg-hostname-monitor.h						\
         $(NULL)
 
 libxdg_hostname_gobject_1_la_SOURCES =                                	\
-        xdghostname.h							\
-        xdghostnameerror.h		xdghostnameerror.c		\
-        xdghostnamemonitor.h		xdghostnamemonitor.c		\
+        xdg-hostname.h							\
+        xdg-hostname-error.h		xdg-hostname-error.c		\
+        xdg-hostname-monitor.h		xdg-hostname-monitor.c		\
         $(BUILT_SOURCES)						\
         $(NULL)
 
diff --git a/src/xdghostname/xdghostnameerror.c b/src/xdg-hostname/xdg-hostname-error.c
index fcdf7c0..d6a0313 100644
--- a/src/xdghostname/xdghostnameerror.c
+++ b/src/xdg-hostname/xdg-hostname-error.c
@@ -26,10 +26,10 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "xdghostnameerror.h"
+#include "xdg-hostname-error.h"
 
 /**
- * SECTION:xdghostnameerror
+ * SECTION:xdg-hostname-error
  * @title: XdgHostnameError
  * @short_description: Error domain for xdg-hostname
  * @include: xdghostname/xdghostname.h
diff --git a/src/xdghostname/xdghostnameerror.h b/src/xdg-hostname/xdg-hostname-error.h
index 4139570..ecbbb7d 100644
--- a/src/xdghostname/xdghostnameerror.h
+++ b/src/xdg-hostname/xdg-hostname-error.h
@@ -22,7 +22,7 @@
  */
 
 #if !defined (_XDG_HOSTNAME_COMPILATION) && !defined(_XDG_HOSTNAME_INSIDE_XDG_HOSTNAME_H)
-#error "Only <xdghostname/xdghostname.h> can be included directly, this file may disappear or change contents."
+#error "Only <xdg-hostname/xdg-hostname.h> can be included directly, this file may disappear or change contents."
 #endif
 
 #ifndef __XDG_HOSTNAME_ERROR_H
diff --git a/src/xdghostname/xdghostnamemonitor.c b/src/xdg-hostname/xdg-hostname-monitor.c
index 5e43fdd..88cc925 100644
--- a/src/xdghostname/xdghostnamemonitor.c
+++ b/src/xdg-hostname/xdg-hostname-monitor.c
@@ -26,12 +26,12 @@
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "xdghostnamemonitor.h"
+#include "xdg-hostname-monitor.h"
 
-#include "xdghostnameclientglue.h"
+#include "xdg-hostname-client-glue.h"
 
 /**
- * SECTION:xdghostnamemonitor
+ * SECTION:xdg-hostname-monitor
  * @title: XdgHostnameMonitor
  * @short_description: Read, monitor and change hostname data
  * @include: xdghostname/xdghostname.h
diff --git a/src/xdghostname/xdghostnamemonitor.h b/src/xdg-hostname/xdg-hostname-monitor.h
index ea7ca7d..335510b 100644
--- a/src/xdghostname/xdghostnamemonitor.h
+++ b/src/xdg-hostname/xdg-hostname-monitor.h
@@ -22,7 +22,7 @@
  */
 
 #if !defined (_XDG_HOSTNAME_COMPILATION) && !defined(_XDG_HOSTNAME_INSIDE_XDG_HOSTNAME_H)
-#error "Only <xdghostname/xdghostname.h> can be included directly, this file may disappear or change contents."
+#error "Only <xdg-hostname/xdg-hostname.h> can be included directly, this file may disappear or change contents."
 #endif
 
 #ifndef __XDG_HOSTNAME_MONITOR_H
diff --git a/src/xdghostname/xdghostname.h b/src/xdg-hostname/xdg-hostname.h
index 6584b9d..4ffc515 100644
--- a/src/xdghostname/xdghostname.h
+++ b/src/xdg-hostname/xdg-hostname.h
@@ -25,8 +25,8 @@
 #define __XDG_HOSTNAME_H
 
 #define _XDG_HOSTNAME_INSIDE_XDG_HOSTNAME_H 1
-#include <xdghostname/xdghostnameerror.h>
-#include <xdghostname/xdghostnamemonitor.h>
+#include <xdg-hostname/xdg-hostname-error.h>
+#include <xdg-hostname/xdg-hostname-monitor.h>
 #undef _XDG_HOSTNAME_INSIDE_XDG_HOSTNAME_H
 
 #endif /* __XDG_HOSTNAME_H */