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

@@ -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>

Makefile.am

@@ -1,3 +1,2 @@
 
-SUBDIRS=dbus server test doc
-
+SUBDIRS=dbus bus test doc

bus/Makefile.am

@@ -1,5 +1,5 @@
 
-INCLUDES=-I$(top_srcdir) $(DBUS_SERVER_CFLAGS) \
+INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) \
 	-DDAEMON_NAME=\"dbus-daemon-1\"
 
 EFENCE=
@@ -9,7 +9,7 @@ bin_PROGRAMS=dbus-daemon-1
 dbus_daemon_1_SOURCES=				\
 	main.c
 
-dbus_daemon_1_LDADD= 				\
-	$(EFENCE)				\
-	$(DBUS_SERVER_LIBS)			\
+dbus_daemon_1_LDADD=					\
+	$(EFENCE)					\
+	$(DBUS_BUS_LIBS)				\
 	$(top_builddir)/dbus/libdbus-convenience.la

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