-shared_LIBRARIES = forb_shlib_test
-forb_shlib_test_SOURCES = forb_shlib.c
-forb_shlib_test_SERVER_IDL = test_obj.idl
+wvtest_SCRIPTS = forbrun.sh
+
+shared_LIBRARIES = test_obj
+test_obj_SOURCES = test_obj.c
+test_obj_SERVER_IDL = test_obj.idl
+
+shared_LIBRARIES += test_client
+test_client_SOURCES = test_client.c
+test_client_CLIENT_IDL = test_obj.idl
+
+shared_LIBRARIES += forbrun_printargs
+forbrun_printargs_SOURCES = forbrun_printargs.c
+
INCLUDES += -I.