diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-14 14:17:39 -0500 |
| commit | 3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff (patch) | |
| tree | 1722f023f4d1223106b9ec6cad9068b64b021a48 /Makefile.am | |
| parent | ffb532bdd37d51a328c92258a3c1ee1fb6e9a787 (diff) | |
| parent | 4810423912b7f53f716ba5665aba56234461ca6f (diff) | |
| download | libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.gz libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.tar.bz2 libdbusmenu-3a8fb0811440d5e266699bcd5e0e1b2bea8a58ff.zip | |
* Upstream Merge
* Build fixes to allow more optional builds
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index c2c0980..6b11b31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,23 @@ +ACLOCAL_AMFLAGS = -I m4 + EXTRA_DIST = \ COPYING.2.1 \ COPYING-GPL3 \ m4/introspection.m4 +if WANT_TESTS +TESTS_SUBDIR = tests +endif + +if WANT_LIBDBUSMENUGTK +LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk +endif + SUBDIRS = \ libdbusmenu-glib \ - libdbusmenu-gtk \ + $(LIBDBUSMENUGTK_SUBDIR) \ tools \ - tests \ + $(TESTS_SUBDIR) \ docs \ po |