-libtr_tid_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
-libtr_tid_la_LIBADD = gsscon/libgsscon.la
-libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0 -no-undefined
+common_tests_tr_dh_test_SOURCES = common/tr_dh.c \
+common/tr_debug.c \
+common/tests/dh_test.c
+
+common_tests_mq_test_SOURCES = common/tr_mq.c \
+common/tests/mq_test.c \
+common/tr_debug.c
+
+common_tests_mq_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
+
+common_tests_cfg_test_SOURCES = common/tests/cfg_test.c \
+$(common_srcs) \
+$(tid_srcs) \
+$(trp_srcs)
+common_tests_cfg_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
+common_tests_cfg_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
+
+common_tests_thread_test_SOURCES = common/tr_mq.c \
+common/tr_debug.c \
+common/tests/thread_test.c
+
+common_tests_commtest_SOURCES = common/tests/commtest.c \
+$(common_srcs) \
+$(tid_srcs) \
+$(trp_srcs)
+common_tests_commtest_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
+common_tests_commtest_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
+
+common_tests_thread_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread