[gjs] Bug 584858: Move gjsdbus to gjs-dbus to match installed location.

[C. Scott Ananian <cananian src gnome org>]

commit eedf35c32c4bb8403e94644a7b6d5139503a079f
Author: C. Scott Ananian <cscott litl com>
Date:   Thu Jun 4 17:17:44 2009 -0400

    Bug 584858: Move gjsdbus to gjs-dbus to match installed location.
    
    In order for
     #include <gjs-dbus/dbus.h>
    in dbus-private.h to work both in the source tree and after it is installed
    in $INCUDEDIR/gjs-1.0/gjs-dbus, we need our locate copy of dbus.h to be in
    a directory named gjs-dbus, not gjsdbus.
---
 .gitignore                                  |    1 +
 Makefile-gjsdbus.am => Makefile-gjs-dbus.am |   12 ++++++------
 Makefile.am                                 |    2 +-
 {gjsdbus => gjs-dbus}/dbus-private.h        |    4 ++--
 {gjsdbus => gjs-dbus}/dbus-proxy.c          |    0
 {gjsdbus => gjs-dbus}/dbus-proxy.h          |    0
 {gjsdbus => gjs-dbus}/dbus-signals.c        |    0
 {gjsdbus => gjs-dbus}/dbus.c                |    4 ++--
 {gjsdbus => gjs-dbus}/dbus.h                |    0
 modules/dbus-exports.c                      |    2 +-
 modules/dbus-values.c                       |    2 +-
 modules/dbus.c                              |    2 +-
 12 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9b946d..ff83eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ configure
 depcomp
 gjs-1.0.pc
 gjs-console
+gjs-dbus-1.0.pc
 gjs-gi-1.0.pc
 gjstest.c
 gjstest.c.stamp
diff --git a/Makefile-gjsdbus.am b/Makefile-gjs-dbus.am
similarity index 77%
rename from Makefile-gjsdbus.am
rename to Makefile-gjs-dbus.am
index 04aede9..54ee4ef 100644
--- a/Makefile-gjsdbus.am
+++ b/Makefile-gjs-dbus.am
@@ -3,14 +3,14 @@ lib_LTLIBRARIES += libgjs-dbus.la
 
 gjs_dbusheaderdir=$(gjsincludedir)/gjs-dbus
 gjs_dbusheader_HEADERS =	\
-	gjsdbus/dbus.h		\
-	gjsdbus/dbus-proxy.h	\
-	gjsdbus/dbus-private.h
+	gjs-dbus/dbus.h		\
+	gjs-dbus/dbus-proxy.h	\
+	gjs-dbus/dbus-private.h
 
 libgjs_dbus_la_SOURCES =	\
-	gjsdbus/dbus.c		\
-	gjsdbus/dbus-signals.c	\
-	gjsdbus/dbus-proxy.c
+	gjs-dbus/dbus.c		\
+	gjs-dbus/dbus-signals.c	\
+	gjs-dbus/dbus-proxy.c
 
 libgjs_dbus_la_CPPFLAGS =		\
 	$(AM_CPPFLAGS)				\
diff --git a/Makefile.am b/Makefile.am
index 9f1117d..c6cd58f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,7 +87,7 @@ gjstest_files_with_tests += 	\
 	gjs/stack.c				\
 	util/glib.c
 
-include Makefile-gjsdbus.am
+include Makefile-gjs-dbus.am
 include Makefile-gi.am
 include Makefile-modules.am
 include Makefile-examples.am
diff --git a/gjsdbus/dbus-private.h b/gjs-dbus/dbus-private.h
similarity index 98%
rename from gjsdbus/dbus-private.h
rename to gjs-dbus/dbus-private.h
index 3accde9..a9cb8d7 100644
--- a/gjsdbus/dbus-private.h
+++ b/gjs-dbus/dbus-private.h
@@ -23,8 +23,8 @@
 #define __GJS_UTIL_DBUS_PRIVATE_H__
 
 #include <glib.h>
-#include <gjsdbus/dbus.h>
-#include <gjsdbus/dbus-proxy.h>
+#include <gjs-dbus/dbus.h>
+#include <gjs-dbus/dbus-proxy.h>
 
 G_BEGIN_DECLS
 
diff --git a/gjsdbus/dbus-proxy.c b/gjs-dbus/dbus-proxy.c
similarity index 100%
rename from gjsdbus/dbus-proxy.c
rename to gjs-dbus/dbus-proxy.c
diff --git a/gjsdbus/dbus-proxy.h b/gjs-dbus/dbus-proxy.h
similarity index 100%
rename from gjsdbus/dbus-proxy.h
rename to gjs-dbus/dbus-proxy.h
diff --git a/gjsdbus/dbus-signals.c b/gjs-dbus/dbus-signals.c
similarity index 100%
rename from gjsdbus/dbus-signals.c
rename to gjs-dbus/dbus-signals.c
diff --git a/gjsdbus/dbus.c b/gjs-dbus/dbus.c
similarity index 99%
rename from gjsdbus/dbus.c
rename to gjs-dbus/dbus.c
index 9323d1c..0033019 100644
--- a/gjsdbus/dbus.c
+++ b/gjs-dbus/dbus.c
@@ -11,8 +11,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "gjsdbus/dbus-private.h"
-#include "gjsdbus/dbus-proxy.h"
+#include "gjs-dbus/dbus-private.h"
+#include "gjs-dbus/dbus-proxy.h"
 #include "glib.h"
 
 #include "util/log.h"
diff --git a/gjsdbus/dbus.h b/gjs-dbus/dbus.h
similarity index 100%
rename from gjsdbus/dbus.h
rename to gjs-dbus/dbus.h
diff --git a/modules/dbus-exports.c b/modules/dbus-exports.c
index 80edd1f..1d56a70 100644
--- a/modules/dbus-exports.c
+++ b/modules/dbus-exports.c
@@ -24,7 +24,7 @@
 #include "dbus-exports.h"
 #include "dbus-values.h"
 
-#include "gjsdbus/dbus.h"
+#include "gjs-dbus/dbus.h"
 
 #include <gjs/gjs.h>
 
diff --git a/modules/dbus-values.c b/modules/dbus-values.c
index 641115d..f8e9faa 100644
--- a/modules/dbus-values.c
+++ b/modules/dbus-values.c
@@ -25,7 +25,7 @@
 
 #include <gjs/gjs.h>
 
-#include <gjsdbus/dbus.h>
+#include <gjs-dbus/dbus.h>
 #include <util/log.h>
 
 #include <string.h>
diff --git a/modules/dbus.c b/modules/dbus.c
index 46b9a10..63ffa31 100644
--- a/modules/dbus.c
+++ b/modules/dbus.c
@@ -29,7 +29,7 @@
 #include "../gi/closure.h"
 
 #include <util/log.h>
-#include <gjsdbus/dbus.h>
+#include <gjs-dbus/dbus.h>
 
 static gboolean session_bus_weakref_added = FALSE;
 static DBusConnection *session_bus = NULL;