Checkpoint commit: refactoring the request code in TIDS for better reuse

[trust_router.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2e27e3f..e13e55a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,10 @@
+ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 bin_PROGRAMS= tr/trust_router tr/trpc tid/example/tidc tid/example/tids common/tests/tr_dh_test common/tests/mq_test \
               common/tests/thread_test trp/msgtst trp/test/rtbl_test trp/test/ptbl_test common/tests/cfg_test \
               common/tests/commtest common/tests/name_test common/tests/filt_test mon/tests/test_mon_req_encode \
-              mon/tests/test_mon_req_decode
+              mon/tests/test_mon_req_decode mon/tests/test_mon_resp_encode
 AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS)
 AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS)
 SUBDIRS = gsscon 
@@ -19,7 +20,8 @@ common_srcs = common/tr_name.c \
        common/tr_rp.c \
        common/tr_idp.c \
        common/tr_filter.c \
-       common/tr_gss.c
+       common/tr_gss_names.c \
+       common/tr_socket.c
 
 tid_srcs = tid/tid_resp.c \
 tid/tid_req.c \
@@ -37,9 +39,12 @@ common/tr_config.c \
 common/tr_mq.c
 
 mon_srcs =                      \
-    mon/tr_mon_req.c            \
-    mon/tr_mon_req_encode.c     \
-    mon/tr_mon_req_decode.c
+    mon/mon_common.c                \
+    mon/mon_req.c            \
+    mon/mon_req_encode.c     \
+    mon/mon_req_decode.c     \
+    mon/mon_resp.c           \
+    mon/mon_resp_encode.c
 
 check_PROGRAMS = common/t_constraint
 TESTS = common/t_constraint
@@ -73,6 +78,7 @@ tr/tr_event.c \
 tr/tr_cfgwatch.c \
 tr/tr_tid.c \
 tr/tr_trp.c \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -81,6 +87,7 @@ tr_trust_router_LDFLAGS = $(AM_LDFLAGS) -levent_pthreads -pthread
 tr_trust_router_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 tr_trpc_SOURCES =tr/trpc_main.c \
 tr/tr_trp.c \
+common/tr_gss.c \
 $(trp_srcs) \
 $(tid_srcs) \
 $(common_srcs)
@@ -98,12 +105,13 @@ trp_msgtst_LDADD =  $(GLIB_LIBS)
 
 trp_test_rtbl_test_SOURCES = trp/test/rtbl_test.c \
 common/tr_name.c \
-common/tr_gss.c \
+common/tr_gss_names.c \
 common/tr_debug.c \
 trp/trp_rtable.c
 trp_test_rtbl_test_LDADD =  $(GLIB_LIBS)
 
 trp_test_ptbl_test_SOURCES = trp/test/ptbl_test.c \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -111,6 +119,7 @@ trp_test_ptbl_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 trp_test_ptbl_test_LDFLAGS = $(AM_LDFLAGS) -pthread
 
 tid_example_tidc_SOURCES = tid/example/tidc_main.c \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -118,6 +127,7 @@ tid_example_tidc_LDADD = gsscon/libgsscon.la  $(GLIB_LIBS)
 tid_example_tidc_LDFLAGS = $(AM_LDFLAGS) -pthread
 
 tid_example_tids_SOURCES = tid/example/tids_main.c \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -136,6 +146,7 @@ common_tests_mq_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
 
 common_tests_cfg_test_SOURCES = common/tests/cfg_test.c \
 $(common_srcs) \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs)
 common_tests_cfg_test_LDADD = gsscon/libgsscon.la  $(GLIB_LIBS)
@@ -147,6 +158,7 @@ common/tests/thread_test.c
 
 common_tests_commtest_SOURCES = common/tests/commtest.c \
 $(common_srcs) \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs)
 common_tests_commtest_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -156,6 +168,7 @@ common_tests_thread_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
 
 common_tests_name_test_SOURCES = common/tests/name_test.c \
               $(common_srcs) \
+              common/tr_gss.c \
               $(tid_srcs) \
               $(trp_srcs)
 common_tests_name_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -164,6 +177,7 @@ common_tests_name_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 common_tests_filt_test_SOURCES = common/tests/filt_test.c \
               $(common_srcs) \
+              common/tr_gss.c \
               $(tid_srcs) \
               $(trp_srcs)
 common_tests_filt_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -171,15 +185,23 @@ common_tests_filt_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc -pthread
 common_tests_filt_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 mon_tests_test_mon_req_encode_SOURCES = mon/tests/test_mon_req_encode.c \
-    $(mon_srcs)
+    $(mon_srcs) \
+    common/tr_name.c
 mon_tests_test_mon_req_encode_LDADD = $(GLIB_LIBS)
 mon_tests_test_mon_req_encode_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 mon_tests_test_mon_req_decode_SOURCES = mon/tests/test_mon_req_decode.c \
-    $(mon_srcs)
+    $(mon_srcs) \
+    common/tr_name.c
 mon_tests_test_mon_req_decode_LDADD = $(GLIB_LIBS)
 mon_tests_test_mon_req_decode_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
+mon_tests_test_mon_resp_encode_SOURCES = mon/tests/test_mon_resp_encode.c \
+    $(mon_srcs) \
+    common/tr_name.c
+mon_tests_test_mon_resp_encode_LDADD = $(GLIB_LIBS)
+mon_tests_test_mon_resp_encode_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
+
 pkginclude_HEADERS = include/trust_router/tid.h include/trust_router/tr_name.h \
        include/tr_debug.h include/trust_router/trp.h \
        include/trust_router/tr_dh.h \
@@ -191,12 +213,12 @@ noinst_HEADERS = include/gsscon.h include/tr_config.h \
        include/tr_idp.h include/tr_rp.h \
        include/tr_comm.h include/tr_apc.h \
        include/tr_tid.h include/tr_trp.h \
-       include/tr_filter.h include/tr_gss.h \
+       include/tr_filter.h include/tr_gss_names.h \
        include/tid_internal.h include/trp_internal.h \
        include/tr_cfgwatch.h include/tr_event.h \
        include/tr_mq.h include/trp_ptable.h \
        include/trp_rtable.h include/tr_util.h \
-       include/tr_name_internal.h
+       include/tr_name_internal.h include/tr_gss.h
 
 pkgdata_DATA=schema.sql
 nobase_dist_pkgdata_DATA=redhat/init redhat/sysconfig redhat/organizations.cfg redhat/tidc-wrapper redhat/trust_router-wrapper redhat/tr-test-internal.cfg redhat/default-internal.cfg redhat/tids-wrapper redhat/sysconfig.tids