--- a/nodejs/Makefile.am	Mon Jul 19 15:44:49 2010 +0800
+++ b/nodejs/Makefile.am	Wed Dec 01 12:25:56 2010 +0800
@@ -1,5 +1,7 @@
+# -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 4; -*-
+# vim: sw=4:ts=8:sts=4
 
-mbfly_node_SRCS = mbfly_njs.cc X_supp_njs.c coord.cc shapes.cc paints.cc \
+mbfly_node_SRCS = mbfly_njs.cc njs_mb_supp.c coord.cc shapes.cc paints.cc \
 		font.cc
 mbfly_node_CFLAGS= -I$(abs_top_builddir)/include \
 	-I$(abs_top_srcdir)/include \
@@ -7,6 +9,10 @@
 	@pangocairo_CFLAGS@ $(CFLAGS)
 mbfly_node_LDFLAGS = -L$(abs_top_builddir)/src/.libs @pangocairo_LIBS@
 
+if XSHM
+mbfly_node_LDFLAGS += -lXext
+endif
+
 all: mbfly.node
 clean: clean-mbfly-node
 
@@ -17,9 +23,10 @@
 		LDFLAGS="$(mbfly_node_LDFLAGS)" \
 		TOP_BUILDDIR="$(abs_top_builddir)" \
 		WAFLOCK=$(abs_builddir)/objs/.lock-wscript \
-		$(NODE_WAF) configure build --blddir=$(abs_builddir)/objs
+		$(NODE_WAF) configure build --srcdir=$(abs_srcdir) \
+		--blddir=$(abs_builddir)/objs
 
 clean-mbfly-node:
-	cd $(srcdir); \
-	WAFLOCK=$(abs_builddir)/.lock-wscript \
+	-cd $(srcdir); \
+	WAFLOCK=$(abs_builddir)/objs/.lock-wscript \
 		$(NODE_WAF) clean