diff options
| author | Rob Taylor <rob.taylor@collabora.co.uk> | 2006-09-24 14:32:52 +0100 |
|---|---|---|
| committer | Rob Taylor <rob.taylor@collabora.co.uk> | 2006-09-24 14:32:52 +0100 |
| commit | 4d6aa726814295cfabab95a51d2e320d02b72dde (patch) | |
| tree | bcfba947e997bc98241f9213570b679be488cc4a | |
| parent | 1571d556aa5f087e52074e5fd7c5e5c29667c551 (diff) | |
Add m4 directory
Add missing changes from last commit.
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rwxr-xr-x | autogen.sh | 6 | ||||
| -rw-r--r-- | configure.in | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 17001c8..7b5a434 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ GLIB_PC=dbus-glib-1.pc SUBDIRS=dbus tools test doc -DIST_SUBDIRS=dbus tools test doc +DIST_SUBDIRS=dbus tools test doc m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(GLIB_PC) @@ -22,7 +22,7 @@ DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc EXTRA_DIST += ChangeLog ChangeLog: $(srcdir)/ChangeLog -$(srcdir)/ChangeLog: +$(srcdir)/ChangeLog: FORCE @if test -d "$(srcdir)/.git"; then \ (cd "$(srcdir)" && \ ./missing --run git-log --stat) | fmt --split-only > $@.tmp \ @@ -47,7 +47,7 @@ clean-bbg: GCOV_DIRS=$(GLIB_SUBDIR) -coverage-report.txt: +coverage-report.txt: FORCE BBG_FILES=`find $(GCOV_DIRS) -name "*.bbg" -o -name "*.gcno"` ; \ C_FILES= ; \ for F in $$BBG_FILES ; do \ @@ -76,4 +76,5 @@ check-coverage: endif -.PHONY: ChangeLog $(srcdir)/ChangeLog coverage-report.txt +FORCE: + @@ -146,7 +146,11 @@ for arg in $*; do done if $run_configure; then - $srcdir/configure --enable-maintainer-mode "$@" + if test -z "$*"; then + $srcdir/configure --enable-maintainer-mode --enable-gtk-doc --enable-tests --enable-verbose-mode --enable-checks --enable-asserts + else + $srcdir/configure --enable-maintainer-mode "$@" + fi echo echo "Now type 'make' to compile $PROJECT." else diff --git a/configure.in b/configure.in index 65e3b98..3e758bb 100644 --- a/configure.in +++ b/configure.in @@ -828,6 +828,7 @@ AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test AC_OUTPUT([ Makefile +m4/Makefile doc/Makefile doc/reference/Makefile doc/reference/version.xml |