diff options
| author | Miloslav Trmac <mitr@volny.cz> | 2003-06-29 15:35:06 +0000 |
|---|---|---|
| committer | Miloslav Trmac <mitr@volny.cz> | 2003-06-29 15:35:06 +0000 |
| commit | fc2743e206a9b056f6f306e8e1365f8a03afa2bf (patch) | |
| tree | dd1bb10ea4ea5f584765203e8f5329f206cef50e | |
| parent | 928d7f3cadc94c59a207f6f656652d858f4a85e7 (diff) | |
2003-06-29 Miloslav Trmac <mitr@volny.cz>
* doc/Makefile.am:
* tools/Makefile.am: Don't assume srcdir == builddir.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | doc/Makefile.am | 14 | ||||
| -rw-r--r-- | test/Makefile.am | 4 |
3 files changed, 13 insertions, 8 deletions
@@ -1,5 +1,8 @@ 2003-06-29 Miloslav Trmac <mitr@volny.cz> + * doc/Makefile.am: + * tools/Makefile.am: Don't assume srcdir == builddir. + * dbus/dbus-memory.c (dbus_realloc): Don't check guards after shrinking the allocated block. (_dbus_memory_test): New function. diff --git a/doc/Makefile.am b/doc/Makefile.am index da1d011a..891c0209 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,14 +11,16 @@ all-local: dbus-specification.html dbus-test-plan.html endif dbus-specification.html: dbus-specification.sgml - $(DB2HTML) -o . --nochunks dbus-specification.sgml && \ - rm -r dbus-specification/stylesheet-images && \ - (if test -d dbus-specification ; then rmdir dbus-specification ; fi) + $(DB2HTML) -o . --nochunks $< && \ + rm -r $(srcdir)/dbus-specification/stylesheet-images && \ + (if test -d $(srcdir)/dbus-specification ; then \ + rmdir $(srcdir)/dbus-specification ; fi) dbus-test-plan.html: dbus-test-plan.sgml - $(DB2HTML) -o . --nochunks dbus-test-plan.sgml && \ - rm -r dbus-test-plan/stylesheet-images && \ - (if test -d dbus-test-plan ; then rmdir dbus-test-plan ; fi) + $(DB2HTML) -o . --nochunks $< && \ + rm -r $(srcdir)/dbus-test-plan/stylesheet-images && \ + (if test -d $(srcdir)/dbus-test-plan ; then \ + rmdir $(srcdir)/dbus-test-plan ; fi) maintainer-clean-local: rm -f dbus-test-plan.html diff --git a/test/Makefile.am b/test/Makefile.am index 227f0dba..04df3510 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -70,10 +70,10 @@ dist-hook: for D in $(TESTDIRS); do \ test -d $(distdir)/$$D || mkdir $(distdir)/$$D || exit 1 ; \ done ; \ - FILES=`$(FIND_TESTS) -o -name "*.in"` ; \ + FILES=`(cd $(srcdir) && $(FIND_TESTS) -o -name "*.in" -a -not -name Makefile.in)` ; \ for F in $$FILES; do \ echo '-- Disting file '$$F ; \ - cp $$F $(distdir)/$$F || exit 1 ; \ + cp $(srcdir)/$$F $(distdir)/$$F || exit 1 ; \ done ## copy tests to builddir so that generated tests and static tests |