summaryrefslogtreecommitdiff
path: root/lib/Makefile.am
diff options
context:
space:
mode:
authorRoger Meier <roger@apache.org>2014-01-26 11:44:27 +0100
committerRoger Meier <roger@apache.org>2014-01-26 11:44:27 +0100
commit8909cbdf819a059874ffc22ca6c04a06211321f6 (patch)
tree6b343d8209c8b1486b87538f896163847710bf66 /lib/Makefile.am
parentd0024544bc2f45b6c039387fe69df8cf77fde45d (diff)
downloadthrift-8909cbdf819a059874ffc22ca6c04a06211321f6.tar.gz
THRIFT-2327 nodejs: nodejs test suite should be bundled with the library
Patch: Pierre Lamot further modifications by Roger Meier - git mv instead of delete and add - detect node or nodejs with configure.ac - use exit instead of return within lib/nodejs/test/testAll.sh
Diffstat (limited to 'lib/Makefile.am')
-rw-r--r--lib/Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1cc5c6cbc..26d9020df 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -70,6 +70,11 @@ if WITH_D
SUBDIRS += d
endif
+if WITH_NODEJS
+SUBDIRS += nodejs
+endif
+
+
# All of the libs that don't use Automake need to go in here
# so they will end up in our release tarballs.
EXTRA_DIST = \
@@ -79,6 +84,5 @@ EXTRA_DIST = \
delphi \
javame \
js \
- nodejs \
ocaml \
st