X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=1c933d65ccae2537bed351084a91f4c756c482df;hb=d1130807819f670c45d73e1e062c5cff0138bfdf;hp=2d94db2840b7971ad5f9aeb2a620dfe6c4e9d302;hpb=884dfb4e2fa13d09a0c84d4da0febfdfb75e1bf6;p=trust_router.git

diff --git a/Makefile.am b/Makefile.am
index 2d94db2..1c933d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,11 +17,17 @@ common_srcs = common/tr_name.c \
 	common/tr_util.c \
 	common/tr_apc.c \
 	common/tr_comm.c \
+	common/tr_comm_encoders.c \
 	common/tr_rp.c \
+	common/tr_rp_client.c \
+	common/tr_rp_client_encoders.c \
 	common/tr_idp.c \
+	common/tr_idp_encoders.c \
 	common/tr_filter.c \
+	common/tr_filter_encoders.c \
 	common/tr_gss_names.c \
-	common/tr_socket.c
+	common/tr_socket.c \
+	$(mon_srcs)
 
 tid_srcs = tid/tid_resp.c \
 tid/tid_req.c \
@@ -31,24 +37,45 @@ tid/tidc.c
 trp_srcs = trp/trp_conn.c \
 trp/trps.c \
 trp/trpc.c \
+trp/trp_peer.c \
+trp/trp_peer_encoders.c \
 trp/trp_ptable.c \
+trp/trp_ptable_encoders.c \
+trp/trp_route.c \
+trp/trp_route_encoders.c \
 trp/trp_rtable.c \
+trp/trp_rtable_encoders.c \
 trp/trp_req.c \
 trp/trp_upd.c \
-common/tr_config.c \
-common/tr_config_internal.c \
-common/tr_mq.c
-
+common/tr_mq.c \
+$(config_srcs)
+
+# configuration parsing sources
+config_srcs = \
+    common/tr_config.c \
+    common/tr_config_comms.c \
+    common/tr_config_encoders.c \
+    common/tr_config_filters.c \
+    common/tr_config_internal.c \
+    common/tr_config_orgs.c \
+    common/tr_config_realms.c \
+    common/tr_config_rp_clients.c
+
+# general monitoring message sources
 mon_srcs =                   \
-    mon/mons.c               \
-    mon/monc.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_decode.c    \
     mon/mon_resp_encode.c
 
+# monitoring server sources
+mons_srcs = \
+    mon/mons.c \
+    mon/mons_handlers.c
+
 check_PROGRAMS = common/t_constraint
 TESTS = common/t_constraint
 TEST_CFLAGS = -Wno-missing-prototypes
@@ -80,19 +107,24 @@ tr/tr.c \
 tr/tr_event.c \
 tr/tr_cfgwatch.c \
 tr/tr_tid.c \
+tr/tr_tid_mons.c \
 tr/tr_trp.c \
+tr/tr_trp_mons.c \
 tr/tr_mon.c \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs) \
-$(mon_srcs) \
-$(common_srcs)
+$(common_srcs) \
+$(mons_srcs)
 
 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 \
+common/tr_gss_client.c \
 $(trp_srcs) \
 $(tid_srcs) \
 $(common_srcs)
@@ -102,10 +134,12 @@ tr_trpc_LDFLAGS = $(AM_LDFLAGS) -pthread
 
 tr_trmon_SOURCES = tr/trmon_main.c \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs) \
-$(mon_srcs) \
-$(common_srcs)
+$(common_srcs) \
+mon/monc.c
+
 tr_trmon_LDADD = gsscon/libgsscon.la  $(GLIB_LIBS)
 tr_trmon_LDFLAGS = $(AM_LDFLAGS) -pthread
 
@@ -121,11 +155,16 @@ trp_test_rtbl_test_SOURCES = trp/test/rtbl_test.c \
 common/tr_name.c \
 common/tr_gss_names.c \
 common/tr_debug.c \
-trp/trp_rtable.c
+common/tr_util.c \
+trp/trp_route.c \
+trp/trp_route_encoders.c \
+trp/trp_rtable.c \
+trp/trp_rtable_encoders.c
 trp_test_rtbl_test_LDADD =  $(GLIB_LIBS)
 
 trp_test_ptbl_test_SOURCES = trp/test/ptbl_test.c \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -134,6 +173,7 @@ trp_test_ptbl_test_LDFLAGS = $(AM_LDFLAGS) -pthread
 
 tid_example_tidc_SOURCES = tid/example/tidc_main.c \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -142,6 +182,7 @@ tid_example_tidc_LDFLAGS = $(AM_LDFLAGS) -pthread
 
 tid_example_tids_SOURCES = tid/example/tids_main.c \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs) \
 $(common_srcs)
@@ -161,6 +202,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 \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs)
 common_tests_cfg_test_LDADD = gsscon/libgsscon.la  $(GLIB_LIBS)
@@ -173,6 +215,7 @@ common/tests/thread_test.c
 common_tests_commtest_SOURCES = common/tests/commtest.c \
 $(common_srcs) \
 common/tr_gss.c \
+common/tr_gss_client.c \
 $(tid_srcs) \
 $(trp_srcs)
 common_tests_commtest_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -183,6 +226,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 \
+              common/tr_gss_client.c \
               $(tid_srcs) \
               $(trp_srcs)
 common_tests_name_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -192,6 +236,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 \
+              common/tr_gss_client.c \
               $(tid_srcs) \
               $(trp_srcs)
 common_tests_filt_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@ -228,9 +273,9 @@ noinst_HEADERS = include/gsscon.h include/tr_config.h \
 	include/tr_comm.h include/tr_apc.h \
 	include/tr_tid.h include/tr_trp.h include/tr_mon.h \
 	include/tr_filter.h include/tr_gss_names.h \
-	include/tid_internal.h include/trp_internal.h \
+	include/tid_internal.h include/trp_internal.h include/trp_route.h \
 	include/tr_cfgwatch.h include/tr_event.h \
-	include/tr_mq.h include/trp_ptable.h \
+	include/tr_mq.h include/trp_peer.h include/trp_ptable.h \
 	include/trp_rtable.h include/tr_util.h \
 	include/tr_name_internal.h include/tr_gss.h