X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=49bf774179641b9d6e2cc90577a0a57af72588fa;hb=3b59db3c5565b707e745d58f7ec1df1bdc7c1895;hp=ddfd8d259e717c89b92cc8c2ec1103464246ba9d;hpb=36a471285d0cafbbe74f49d736e472dbfe317a38;p=trust_router.git

diff --git a/Makefile.am b/Makefile.am
index ddfd8d2..49bf774 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,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 \
@@ -35,15 +36,17 @@ trp/trp_rtable.c \
 trp/trp_req.c \
 trp/trp_upd.c \
 common/tr_config.c \
+common/tr_config_internal.c \
 common/tr_mq.c
 
-mon_srcs =                      \
-    mon/tr_mon.c                \
-    mon/tr_mon_req.c            \
-    mon/tr_mon_req_encode.c     \
-    mon/tr_mon_req_decode.c     \
-    mon/tr_mon_resp.c           \
-    mon/tr_mon_resp_encode.c
+mon_srcs =                   \
+    mon/mons.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
@@ -77,14 +80,18 @@ tr/tr_event.c \
 tr/tr_cfgwatch.c \
 tr/tr_tid.c \
 tr/tr_trp.c \
+tr/tr_mon.c \
+common/tr_gss.c \
 $(tid_srcs) \
 $(trp_srcs) \
+$(mon_srcs) \
 $(common_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 \
 $(trp_srcs) \
 $(tid_srcs) \
 $(common_srcs)
@@ -102,12 +109,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)
@@ -115,6 +123,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)
@@ -122,6 +131,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)
@@ -140,6 +150,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)
@@ -151,6 +162,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)
@@ -160,6 +172,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)
@@ -168,6 +181,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)
@@ -202,13 +216,13 @@ noinst_HEADERS = include/gsscon.h include/tr_config.h \
 	include/tr_msg.h include/tr.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_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/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