diff --git a/demo/Makefile b/demo/Makefile
index b6da0d2..3285430 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -1,6 +1,10 @@
-SRC      := smdemo0.c
-TARGETS  := smdemo0 smdemo0-c smdemo0-static smdemo0-static-c
-FILE_BIN := smdemo0 smdemo0-c smdemo0-static smdemo0-static-c
+SRC      := smdemo0.c smdemo0_snd.c smdemo0_rcv.c
+TARGETS  := smdemo0 smdemo0-c smdemo0-static smdemo0-static-c \
+	    smdemo0_snd smdemo0_snd-c smdemo0_snd-static smdemo0_snd-static-c \
+	    smdemo0_rcv smdemo0_rcv-c smdemo0_rcv-static smdemo0_rcv-static-c
+FILE_BIN := smdemo0 smdemo0-c smdemo0-static smdemo0-static-c \
+	    smdemo0_snd smdemo0_snd-c smdemo0_snd-static smdemo0_snd-static-c \
+	    smdemo0_rcv smdemo0_rcv-c smdemo0_rcv-static smdemo0_rcv-static-c
 FILE_LIB := smdemo0.dat
 
 
@@ -10,12 +14,12 @@ include ../Makefile.rule
 
 
 
-DEP_STATIC  += ../lib/libnode.a
-DEP_DYNAMIC += ../lib/libnode.so
-INCLUDE     += -I . -I ../include
-LIBDIR      += -L . -L ../lib
-LIB_STATIC  += ../lib/libnode.a -ldl
-LIB_DYNAMIC += -lnode -ldl
+DEP_STATIC  += ../lib/libshmem.a  ../../libnode/lib/libnode.a
+DEP_DYNAMIC += ../lib/libshmem.so ../../libnode/lib/libnode.so
+INCLUDE     += -I . -I ../include -I ../../libnode/include
+LIBDIR      += -L . -L ../lib     -L ../../libnode/lib
+LIB_STATIC  += ../lib/libshmem.a ../../libnode/lib/libnode.a -ldl
+LIB_DYNAMIC += -lshmem -lnode -ldl
 CFLAGS      += -rdynamic
 
 ifdef _LIBVER_SUPPORT
@@ -52,3 +56,26 @@ smdemo0-static: smdemo0.c $(DEP_STATIC)
 smdemo0-static-c: smdemo0.c $(DEP_STATIC)
 	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $< $(LIB_STATIC)
 
+smdemo0_snd: smdemo0_snd.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+smdemo0_snd-c: smdemo0_snd.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+smdemo0_snd-static: smdemo0_snd.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $< $(LIB_STATIC)
+
+smdemo0_snd-static-c: smdemo0_snd.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $< $(LIB_STATIC)
+
+smdemo0_rcv: smdemo0_rcv.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+smdemo0_rcv-c: smdemo0_rcv.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+smdemo0_rcv-static: smdemo0_rcv.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $< $(LIB_STATIC)
+
+smdemo0_rcv-static-c: smdemo0_rcv.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $< $(LIB_STATIC)