From c531a709f3b0f05c0a95aa932045d6e2209ae7b9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Mon, 16 Dec 2002 00:26:05 +0000 Subject: 2002-12-16 Anders Carlsson * 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. --- Makefile.am | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'Makefile.am') 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 + -- cgit