diff options
| author | Colin Walters <walters@verbum.org> | 2005-06-16 04:32:50 +0000 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2005-06-16 04:32:50 +0000 |
| commit | 6fe36d8791a66ce9415b845c5152ca2b5ec87195 (patch) | |
| tree | 4294c2dbb8b450c35116fae38ee2c069222c54d9 | |
| parent | 5935f33b75ee7830d5521317e1686ec767bce502 (diff) | |
2005-06-16 Colin Walters <walters@verbum.org>
* dbus/Makefile.am:
* mono/doc/Makefile.am:
* test/glib/Makefile.am:
Fix srcdir != builddir issues (Patch from Chris Wilson, #3477)
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/Makefile.am | 2 | ||||
| -rw-r--r-- | mono/doc/Makefile.am | 4 | ||||
| -rw-r--r-- | test/glib/Makefile.am | 4 |
4 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2005-06-16 Colin Walters <walters@verbum.org> + * dbus/Makefile.am: + * mono/doc/Makefile.am: + * test/glib/Makefile.am: + + Fix srcdir != builddir issues (Patch from Chris Wilson, #3477) + +2005-06-16 Colin Walters <walters@verbum.org> + * dbus/dbus-marshal-header.c (_dbus_header_load): Set header byte order from expected byte order (Patch from Chris Wilson, #3475). diff --git a/dbus/Makefile.am b/dbus/Makefile.am index 41a9929b..879a34c7 100644 --- a/dbus/Makefile.am +++ b/dbus/Makefile.am @@ -11,7 +11,7 @@ GLIB_INCLUDES= \ $(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 $@ + $(srcdir)/make-dbus-glib-error-enum.sh $(srcdir)/dbus-protocol.h $@ endif diff --git a/mono/doc/Makefile.am b/mono/doc/Makefile.am index 511bec8c..e98a0277 100644 --- a/mono/doc/Makefile.am +++ b/mono/doc/Makefile.am @@ -5,8 +5,8 @@ DOCDIR = `$(MONODOC) --get-sourcesdir` install-data-local: install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir` install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir` - install -m 644 $(srcdir)/dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir` - install -m 644 $(srcdir)/dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir` + install -m 644 dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir` + install -m 644 dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir` uninstall-local: rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source diff --git a/test/glib/Makefile.am b/test/glib/Makefile.am index fffad087..568dab3d 100644 --- a/test/glib/Makefile.am +++ b/test/glib/Makefile.am @@ -45,10 +45,10 @@ test_service_glib_SOURCES= \ BUILT_SOURCES = test-service-glib-glue.h test-service-glib-bindings.h test-service-glib-glue.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool - $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h test-service-glib.xml + $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-server --output=test-service-glib-glue.h $(srcdir)/test-service-glib.xml test-service-glib-bindings.h: test-service-glib.xml $(top_builddir)/glib/dbus-binding-tool - $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h test-service-glib.xml + $(top_builddir)/glib/dbus-binding-tool --prefix=my_object --mode=glib-client --output=test-service-glib-bindings.h $(srcdir)/test-service-glib.xml CLEANFILES = test-service-glib-glue.h test-service-glib-bindings.h |