diff options
| author | Havoc Pennington <hp@redhat.com> | 2002-11-22 05:59:06 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2002-11-22 05:59:06 +0000 |
| commit | ddad01b1ae33e63ebefc90171d412bafc0b605eb (patch) | |
| tree | 7de65b15a2e4684f4acadf7c93e5ebdb32a0d6ee | |
| parent | c68320376bc93cb744e0a0930eb241eefd764076 (diff) | |
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.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | bus/Makefile.am (renamed from server/Makefile.am) | 8 | ||||
| -rw-r--r-- | bus/main.c (renamed from server/main.c) | 0 | ||||
| -rw-r--r-- | configure.in | 10 |
5 files changed, 18 insertions, 11 deletions
@@ -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/server/Makefile.am b/bus/Makefile.am index 33049961..da115c4d 100644 --- a/server/Makefile.am +++ b/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 diff --git a/server/main.c b/bus/main.c index 1025a0e7..1025a0e7 100644 --- a/server/main.c +++ b/bus/main.c 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 |