summaryrefslogtreecommitdiff
path: root/json-glib
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@openedhand.com>2008-06-13 11:23:08 +0100
committerEmmanuele Bassi <ebassi@openedhand.com>2008-06-13 11:23:08 +0100
commita02a42ef47e61456747e511556097b903f07d68a (patch)
tree8cac10140c8c2500d405823f5db65c8ad7658ab2 /json-glib
parentfdbad1cfd6ad6da9fab631f945ab8d2e85228fdf (diff)
parentbc5c7225535ef447743ac59ecdba8c237549a108 (diff)
downloadjson-glib-a02a42ef47e61456747e511556097b903f07d68a.tar.gz
Merge the fix for bug #965
Merge branch 'bug-965'
Diffstat (limited to 'json-glib')
-rw-r--r--json-glib/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/json-glib/Makefile.am b/json-glib/Makefile.am
index b57b78d..4060d66 100644
--- a/json-glib/Makefile.am
+++ b/json-glib/Makefile.am
@@ -1,6 +1,8 @@
include $(top_srcdir)/Makefile.decl
+if ENABLE_GLIB_TEST
SUBDIRS = . tests
+endif
DIST_SUBDIRS = tests