diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-06-20 15:28:15 +0000 |
| commit | 961e6ca41c1e9433055130569ce3492866e2126b (patch) | |
| tree | 053a3e24565665462a498dee93762a83b5598004 /dbus/Makefile.am | |
| parent | eed3989ea35a62e5f58ee7fc3f50a23ad0821800 (diff) | |
2004-06-20 Havoc Pennington <hp@redhat.com>
* dbus/dbus-glib-error-enum.h: autogenerate the GError enum
codes from the dbus error names
* glib/dbus-glib.h: move to subdir dbus/ since it's included
as dbus/dbus-glib.h and that breakage is now visible due to
including dbus/dbus-glib.h in dbus-glib-lowlevel.h
* glib/dbus-glib.h: s/gproxy/g_proxy/
* dbus/dbus-shared.h: new header to hold stuff shared with
binding APIs
* dbus/dbus-protocol.h (DBUS_ERROR_*): move errors here rather
than dbus-errors.h
* glib/dbus-glib.h (dbus_set_g_error): move to
dbus-glib-lowlevel.h
* glib/dbus-glib.h: remove dbus/dbus.h from here; change a bunch
of stuff to enable this
* dbus/dbus-glib-lowlevel.h: put dbus/dbus.h here
* a bunch of other changes with the same basic "separate glib
bindings from dbus.h" theme
Diffstat (limited to 'dbus/Makefile.am')
| -rw-r--r-- | dbus/Makefile.am | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 255fd7a6..a9ec8808 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -1,6 +1,20 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION +if HAVE_GLIB +DBUS_GLIB_BUILT_INCLUDES= \ + dbus-glib-error-enum.h + +GLIB_INCLUDES= \ + dbus-glib.h \ + dbus-glib-lowlevel.h \ + $(DBUS_GLIB_BUILT_INCLUDES) + +dbus-glib-error-enum.h: dbus-protocol.h make-dbus-glib-error-enum.sh + $(srcdir)/make-dbus-glib-error-enum.sh dbus-protocol.h $@ + +endif + dbusincludedir=$(includedir)/dbus-1.0/dbus dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus @@ -18,8 +32,10 @@ dbusinclude_HEADERS= \ dbus-pending-call.h \ dbus-protocol.h \ dbus-server.h \ + dbus-shared.h \ dbus-threads.h \ - dbus-types.h + dbus-types.h \ + $(GLIB_INCLUDES) dbusarchinclude_HEADERS= \ dbus-arch-deps.h @@ -117,8 +133,9 @@ libdbus_convenience_la_SOURCES= \ $(DBUS_SHARED_SOURCES) \ $(DBUS_UTIL_SOURCES) -BUILT_SOURCES=$(dbusarchinclude_HEADERS) -EXTRA_DIST=dbus-arch-deps.h.in +BUILT_SOURCES=$(dbusarchinclude_HEADERS) $(DBUS_GLIB_BUILT_INCLUDES) +EXTRA_DIST=dbus-arch-deps.h.in make-dbus-glib-error-enum.sh +CLEANFILES=$(DBUS_GLIB_BUILT_INCLUDES) ## this library is the same as libdbus, but exports all the symbols ## and is only used for static linking within the dbus package. |