diff options
| author | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
|---|---|---|
| committer | Cody Russell <crussell@canonical.com> | 2010-06-21 14:47:08 -0500 |
| commit | c4eb1c83cb2bc10c1cfb2346a83182f09e159e53 (patch) | |
| tree | 5e640a3f32b597dd406cbd425d1ced9b5e5ab3ff /Makefile.am | |
| parent | cfdd33a19758224cb835efa705a410d3d4d0db91 (diff) | |
| parent | 3d800bf9b0133a613d28c31957c081d157a89af8 (diff) | |
| download | libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.gz libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.tar.bz2 libdbusmenu-c4eb1c83cb2bc10c1cfb2346a83182f09e159e53.zip | |
Mainline merge, resolve conflicts.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 658f946..3853d2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,7 +8,7 @@ SUBDIRS = \ libdbusmenu-gtk \ tools \ tests \ + docs \ po -DISTCHECK_CONFIGURE_FLAGS = --enable-introspection - +DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-gtk-doc |