Fixes so that all binaries build cleanly.

[trust_router.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index add053d..aac75d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
-bin_PROGRAMS= tr/trust_router tr/trpc tid/example/tidc tid/example/tids common/dh_test/tr_dh_test common/mq_test/mq_test common/mq_test/thread_test trp/msgtst trp/test/rtbl_test trp/test/ptbl_test
+bin_PROGRAMS= tr/trust_router tr/trpc tid/example/tidc tid/example/tids common/dh_test/tr_dh_test common/mq_test/mq_test common/mq_test/thread_test trp/msgtst trp/test/rtbl_test trp/test/ptbl_test common/cfg_test/cfg_test
 AM_CPPFLAGS=-I$(srcdir)/include $(GLIB_CFLAGS)
 AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses $(GLIB_CFLAGS)
 SUBDIRS = gsscon 
 common_srcs = common/tr_name.c \
+       common/tr_gss.c \
        common/tr_constraint.c \
        common/jansson_iterators.h \
        common/tr_msg.c \
@@ -12,8 +13,7 @@ common_srcs = common/tr_name.c \
         common/tr_debug.c \
        common/tr_util.c
 
-tid_srcs = trp/trpc.c \
-tid/tid_resp.c \
+tid_srcs = tid/tid_resp.c \
 tid/tid_req.c \
 tid/tids.c \
 tid/tidc.c
@@ -22,17 +22,16 @@ trp_srcs = trp/trp_upd.c \
 trp/trp_req.c \
 trp/trp_conn.c \
 trp/trps.c \
+trp/trpc.c \
 trp/trp_ptable.c \
 trp/trp_rtable.c
 
 check_PROGRAMS = common/t_constraint
 TESTS = common/t_constraint
 
-#lib_LTLIBRARIES = libtr_tid.la libtr_trp.la
-
 common_t_constraint_SOURCES = common/t_constraint.c
 common_t_constraint_CPPFLAGS = $(AM_CPPFLAGS) -DTESTS=\"$(srcdir)/common/tests.json\"
-common_t_constraint_LDADD = gsscon/libgsscon.la libtr_tid.la
+common_t_constraint_LDADD = gsscon/libgsscon.la 
 
 tr_trust_router_SOURCES = $(common_srcs) \
 tr/tr_main.c \
@@ -53,18 +52,21 @@ $(tid_srcs)
 
 tr_trust_router_CFLAGS = $(AM_CFLAGS) -pthread -v -da -Q
 tr_trust_router_LDFLAGS = $(AM_LDFLAGS) -levent_pthreads
-#tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la libtr_trp.la $(GLIB_LIBS)
 tr_trust_router_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 
 tr_trpc_SOURCES = $(common_srcs) \
 tr/trpc_main.c \
+common/tr_config.c \
+common/tr_idp.c \
+common/tr_apc.c \
+common/tr_comm.c \
+common/tr_filter.c \
 common/tr_rp.c \
 common/tr_mq.c \
 tr/tr_trp.c \
 $(trp_srcs) \
 $(tid_srcs)
 
-#tr_trpc_LDADD = gsscon/libgsscon.la libtr_tid.la libtr_trp.la $(GLIB_LIBS)
 tr_trpc_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 
 trp_msgtst_SOURCES = trp/msgtst.c \
@@ -72,20 +74,20 @@ trp/trp_upd.c \
 trp/trp_req.c \
 tid/tid_req.c \
 tid/tid_resp.c \
-common/tr_msg.c \
-common/tr_name.c \
+trp/trp_ptable.c \
 common/tr_idp.c \
 common/tr_apc.c \
 common/tr_comm.c \
 common/tr_filter.c \
 common/tr_rp.c \
 common/tr_config.c \
-common/tr_debug.c 
+$(common_srcs)
 
 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_debug.c \
 trp/trp_rtable.c
 
@@ -99,14 +101,20 @@ common/tr_mq.c
 
 trp_test_ptbl_test_LDADD = gsscon/libgsscon.la  $(GLIB_LIBS)
 
-tid_example_tidc_SOURCES = tid/example/tidc_main.c 
+tid_example_tidc_SOURCES = tid/example/tidc_main.c \
+$(common_srcs) \
+$(tid_srcs) \
+$(trp_srcs) \
+common/tr_mq.c
 
-#tid_example_tidc_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS)
 tid_example_tidc_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 
-tid_example_tids_SOURCES = tid/example/tids_main.c 
+tid_example_tids_SOURCES = tid/example/tids_main.c \
+$(common_srcs) \
+$(tid_srcs) \
+$(trp_srcs) \
+common/tr_mq.c
 
-#tid_example_tids_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS)
 tid_example_tids_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
 
 common_dh_test_tr_dh_test_SOURCES = common/tr_dh.c \
@@ -119,6 +127,22 @@ common/mq_test/mq_test.c
 common_mq_test_mq_test_CFLAGS = -pthread
 common_mq_test_mq_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc
 
+common_cfg_test_cfg_test_SOURCES = common/tr_config.c \
+common/tr_rp.c \
+common/tr_idp.c \
+common/tr_filter.c \
+common/tr_apc.c \
+common/tr_comm.c \
+common/tr_mq.c \
+$(common_srcs) \
+$(tid_srcs) \
+$(trp_srcs) \
+common/cfg_test/cfg_test.c
+
+common_cfg_test_cfg_test_LDADD = gsscon/libgsscon.la $(GLIB_LIBS)
+common_cfg_test_cfg_test_CFLAGS = -pthread
+common_cfg_test_cfg_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc
+
 common_mq_test_thread_test_SOURCES = common/tr_mq.c \
 common/tr_debug.c \
 common/mq_test/thread_test.c
@@ -126,20 +150,6 @@ common/mq_test/thread_test.c
 common_mq_test_thread_test_CFLAGS = -pthread
 common_mq_test_thread_test_LDFLAGS = $(AM_LDFLAGS) -ltalloc
 
-# libtr_tid_la_SOURCES = tid/tids.c tid/tidc.c tid/tid_req.c tid/tid_resp.c \
-# $(common_srcs)
-# 
-# libtr_tid_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
-# libtr_tid_la_LIBADD = gsscon/libgsscon.la $(GLIB_LIBS)
-# libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2 -no-undefined
-# 
-# libtr_trp_la_SOURCES = trp/trps.c trp/trpc.c trp/trp_req.c trp/trp_upd.c trp/trp_conn.c \
-# $(common_srcs)
-# 
-# libtr_trp_la_CFLAGS = $(AM_CFLAGS) -fvisibility=hidden
-# libtr_trp_la_LIBADD = gsscon/libgsscon.la $(GLIB_LIBS)
-# libtr_trp_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2 -no-undefined
-
 pkginclude_HEADERS = include/trust_router/tid.h include/trust_router/tr_name.h \
        include/tr_debug.h \
        include/trust_router/tr_dh.h \