diff options
author | Anders Carlsson <andersca@codefactory.se> | 2002-12-16 00:26:05 +0000 |
---|---|---|
committer | Anders Carlsson <andersca@codefactory.se> | 2002-12-16 00:26:05 +0000 |
commit | c531a709f3b0f05c0a95aa932045d6e2209ae7b9 (patch) | |
tree | 22e198a761c88fb8ed13a382e943fb25b3bcb38c /Makefile.am | |
parent | 3327ecfdcf6d3cd36b8b739282e9c0d2b768567a (diff) |
2002-12-16 Anders Carlsson <andersca@codefactory.se>
* Makefile.am:
* configure.in:
Add GLib checks and fixup .pc files
* glib/Makefile.am:
* glib/dbus-glib.h:
* glib/dbus-gmain.c: (gdbus_connection_prepare),
(gdbus_connection_check), (gdbus_connection_dispatch),
(gdbus_add_connection_watch), (gdbus_remove_connection_watch),
(dbus_connection_gsource_new):
* glib/dbus-gthread.c: (dbus_gmutex_new), (dbus_gmutex_free),
(dbus_gmutex_lock), (dbus_gmutex_unlock), (dbus_gthread_init):
* glib/test-dbus-glib.c: (message_handler), (main):
Add GLib support.
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e1450cdd..dc120d35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,21 @@ -SUBDIRS=dbus bus test doc +if HAVE_GLIB + GLIB_SUBDIR=glib + GLIB_PC=dbus-glib-1.0.pc +endif + +SUBDIRS=dbus $(GLIB_SUBDIR) bus test doc + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dbus-1.0.pc $(GLIB_PC) + +DISTCLEANFILES = \ + dbus-1.0.pc \ + $(GLIB_PC) + +EXTRA_DIST = \ + dbus-1.0.pc.in \ + dbus-glib-1.0.pc.in all-local: Doxyfile + |