projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix makefile, full make now succeeds
[trust_router.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index
e13e55a
..
3ef94dd
100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-4,7
+4,7
@@
DISTCHECK_CONFIGURE_FLAGS = \
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 \
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_resp_encode
+ mon/tests/test_mon_req_decode mon/tests/test_mon_resp_encode
tr/trmon
AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS)
AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS)
SUBDIRS = gsscon
AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS)
AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS)
SUBDIRS = gsscon
@@
-21,7
+21,8
@@
common_srcs = common/tr_name.c \
common/tr_idp.c \
common/tr_filter.c \
common/tr_gss_names.c \
common/tr_idp.c \
common/tr_filter.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 \
tid_srcs = tid/tid_resp.c \
tid/tid_req.c \
@@
-36,14
+37,16
@@
trp/trp_rtable.c \
trp/trp_req.c \
trp/trp_upd.c \
common/tr_config.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
-mon_srcs =
\
- mon/mon_common.c
\
+mon_srcs = \
+ mon/mon_common.c \
mon/mon_req.c \
mon/mon_req_encode.c \
mon/mon_req_decode.c \
mon/mon_resp.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
check_PROGRAMS = common/t_constraint
mon/mon_resp_encode.c
check_PROGRAMS = common/t_constraint
@@
-78,16
+81,21
@@
tr/tr_event.c \
tr/tr_cfgwatch.c \
tr/tr_tid.c \
tr/tr_trp.c \
tr/tr_cfgwatch.c \
tr/tr_tid.c \
tr/tr_trp.c \
+tr/tr_mon.c \
common/tr_gss.c \
common/tr_gss.c \
+common/tr_gss_client.c \
$(tid_srcs) \
$(trp_srcs) \
$(tid_srcs) \
$(trp_srcs) \
-$(common_srcs)
+$(common_srcs) \
+mon/mons.c
tr_trust_router_LDFLAGS = $(AM_LDFLAGS) -levent_pthreads -pthread
tr_trust_router_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
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 \
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)
$(trp_srcs) \
$(tid_srcs) \
$(common_srcs)
@@
-95,6
+103,17
@@
$(common_srcs)
tr_trpc_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
tr_trpc_LDFLAGS = $(AM_LDFLAGS) -pthread
tr_trpc_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
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) \
+$(common_srcs) \
+mon/monc.c
+
+tr_trmon_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
+tr_trmon_LDFLAGS = $(AM_LDFLAGS) -pthread
+
trp_msgtst_SOURCES = trp/msgtst.c \
$(common_srcs) \
trp/trp_req.c \
trp_msgtst_SOURCES = trp/msgtst.c \
$(common_srcs) \
trp/trp_req.c \
@@
-112,6
+131,7
@@
trp_test_rtbl_test_LDADD = $(GLIB_LIBS)
trp_test_ptbl_test_SOURCES = trp/test/ptbl_test.c \
common/tr_gss.c \
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)
$(tid_srcs) \
$(trp_srcs) \
$(common_srcs)
@@
-120,6
+140,7
@@
trp_test_ptbl_test_LDFLAGS = $(AM_LDFLAGS) -pthread
tid_example_tidc_SOURCES = tid/example/tidc_main.c \
common/tr_gss.c \
tid_example_tidc_SOURCES = tid/example/tidc_main.c \
common/tr_gss.c \
+common/tr_gss_client.c \
$(tid_srcs) \
$(trp_srcs) \
$(common_srcs)
$(tid_srcs) \
$(trp_srcs) \
$(common_srcs)
@@
-128,6
+149,7
@@
tid_example_tidc_LDFLAGS = $(AM_LDFLAGS) -pthread
tid_example_tids_SOURCES = tid/example/tids_main.c \
common/tr_gss.c \
tid_example_tids_SOURCES = tid/example/tids_main.c \
common/tr_gss.c \
+common/tr_gss_client.c \
$(tid_srcs) \
$(trp_srcs) \
$(common_srcs)
$(tid_srcs) \
$(trp_srcs) \
$(common_srcs)
@@
-147,6
+169,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_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)
$(tid_srcs) \
$(trp_srcs)
common_tests_cfg_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@
-159,6
+182,7
@@
common/tests/thread_test.c
common_tests_commtest_SOURCES = common/tests/commtest.c \
$(common_srcs) \
common/tr_gss.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)
$(tid_srcs) \
$(trp_srcs)
common_tests_commtest_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@
-169,6
+193,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_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)
$(tid_srcs) \
$(trp_srcs)
common_tests_name_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@
-178,6
+203,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_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)
$(tid_srcs) \
$(trp_srcs)
common_tests_filt_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
@@
-212,7
+238,7
@@
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_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_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_filter.h include/tr_gss_names.h \
include/tid_internal.h include/trp_internal.h \
include/tr_cfgwatch.h include/tr_event.h \