diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-06-07 20:18:06 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2010-06-07 20:18:06 +0800 |
| commit | f86e54b3c2ca22f3ce576233bcd78808d9107200 (patch) | |
| tree | 55bbf73efaa479fd880977cf55f7b656260de1e0 | |
| parent | 7b4c1e7640abf3abc27ce9d3f7b066b14557840e (diff) | |
| parent | e53b7009489b33ed3073a9de89a7488a326a4f01 (diff) | |
| download | gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar.gz gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar.bz2 gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar.lz gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar.xz gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.tar.zst gsoc2013-empathy-f86e54b3c2ca22f3ce576233bcd78808d9107200.zip | |
Merge branch 'trivia'
| -rw-r--r-- | Makefile.am | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index bd8dd6828..4d4462d2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,12 @@ -SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests +MY_SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests +NST_SUBDIRS = nautilus-sendto-plugin + +DIST_SUBDIRS = $(MY_SUBDIRS) $(NST_SUBDIRS) + +SUBDIRS = $(MY_SUBDIRS) if HAVE_NST -SUBDIRS += nautilus-sendto-plugin +SUBDIRS += $(NST_SUBDIRS) endif ACLOCAL_AMFLAGS = -I m4 @@ -29,7 +34,7 @@ DISTCLEANFILES = \ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper' distclean-local: - if test "x$(srdcir)" = "x."; then :; else \ + if test "x$(srcdir)" = "x."; then :; else \ rm -f ChangeLog; \ fi |