From ddad01b1ae33e63ebefc90171d412bafc0b605eb Mon Sep 17 00:00:00 2001
From: Havoc Pennington <hp@redhat.com>
Date: Fri, 22 Nov 2002 05:59:06 +0000
Subject: 2002-11-22  Havoc Pennington  <hp@pobox.com>

	* Makefile.am (SUBDIRS): rename subdir "server" to "bus"
	because any app can be a server, and any app can be a client,
	the bus is a special kind of server.
---
 ChangeLog          |  8 ++++++++
 Makefile.am        |  3 +--
 bus/Makefile.am    | 15 +++++++++++++++
 bus/main.c         |  8 ++++++++
 configure.in       | 10 +++++-----
 server/Makefile.am | 15 ---------------
 server/main.c      |  8 --------
 7 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 bus/Makefile.am
 create mode 100644 bus/main.c
 delete mode 100644 server/Makefile.am
 delete mode 100644 server/main.c

diff --git a/ChangeLog b/ChangeLog
index 6d5800bc..1bacd344 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
+2002-11-22  Havoc Pennington  <hp@pobox.com>
+
+	* Makefile.am (SUBDIRS): rename subdir "server" to "bus" 
+	because any app can be a server, and any app can be a client, 
+	the bus is a special kind of server.
+
 Thu Nov 21 23:35:31 2002  Zack Rusin  <zack@kde.org>
 
 	* Doxyfile : adding. Still needs Makefile rules to be generated
 	automatically (just run "doxygen" in the toplevel dir for now to
 	generate docs)
+	
 	* dbus/dbus-message.h : Adding sample docs (javadoc since
 	resembles gtk-doc a little more)
+
 	* dbus/dbus.h : Adding sample docs
 
 2002-11-21  Havoc Pennington  <hp@redhat.com>
diff --git a/Makefile.am b/Makefile.am
index e35a6de5..49809c6c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,2 @@
 
-SUBDIRS=dbus server test doc
-
+SUBDIRS=dbus bus test doc
diff --git a/bus/Makefile.am b/bus/Makefile.am
new file mode 100644
index 00000000..da115c4d
--- /dev/null
+++ b/bus/Makefile.am
@@ -0,0 +1,15 @@
+
+INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
+	-DDAEMON_NAME=\"dbus-daemon-1\"
+
+EFENCE=
+
+bin_PROGRAMS=dbus-daemon-1
+
+dbus_daemon_1_SOURCES=				\
+	main.c
+
+dbus_daemon_1_LDADD=					\
+	$(EFENCE)					\
+	$(DBUS_BUS_LIBS)				\
+	$(top_builddir)/dbus/libdbus-convenience.la
diff --git a/bus/main.c b/bus/main.c
new file mode 100644
index 00000000..1025a0e7
--- /dev/null
+++ b/bus/main.c
@@ -0,0 +1,8 @@
+
+int
+main (int argc, char **argv)
+{
+
+
+  return 0;
+}
diff --git a/configure.in b/configure.in
index b236dffe..6a9353e2 100644
--- a/configure.in
+++ b/configure.in
@@ -51,15 +51,15 @@ DBUS_CLIENT_LIBS=
 AC_SUBST(DBUS_CLIENT_CFLAGS)
 AC_SUBST(DBUS_CLIENT_LIBS)
 
-DBUS_SERVER_CFLAGS=
-DBUS_SERVER_LIBS=
-AC_SUBST(DBUS_SERVER_CFLAGS)
-AC_SUBST(DBUS_SERVER_LIBS)
+DBUS_BUS_CFLAGS=
+DBUS_BUS_LIBS=
+AC_SUBST(DBUS_BUS_CFLAGS)
+AC_SUBST(DBUS_BUS_LIBS)
 
 AC_OUTPUT([
 Makefile
 dbus/Makefile
-server/Makefile
+bus/Makefile
 test/Makefile
 doc/Makefile
 dbus-1.0.pc
diff --git a/server/Makefile.am b/server/Makefile.am
deleted file mode 100644
index 33049961..00000000
--- a/server/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-
-INCLUDES=-I$(top_srcdir) $(DBUS_SERVER_CFLAGS) \
-	-DDAEMON_NAME=\"dbus-daemon-1\"
-
-EFENCE=
-
-bin_PROGRAMS=dbus-daemon-1
-
-dbus_daemon_1_SOURCES=				\
-	main.c
-
-dbus_daemon_1_LDADD= 				\
-	$(EFENCE)				\
-	$(DBUS_SERVER_LIBS)			\
-	$(top_builddir)/dbus/libdbus-convenience.la
diff --git a/server/main.c b/server/main.c
deleted file mode 100644
index 1025a0e7..00000000
--- a/server/main.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-int
-main (int argc, char **argv)
-{
-
-
-  return 0;
-}
-- 
cgit