X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=9f792a1d1839d9186558de6604e024b38678550d;hb=43a547a837323b8d628d0f38e0f97b6cbc2fa448;hp=2b3cdc0f0db47b404695a9fd73f3af8def336cf2;hpb=41b40896536ad350227cda3bc16ab6e81f6c184e;p=trust_router.git

diff --git a/Makefile.am b/Makefile.am
index 2b3cdc0..9f792a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,34 @@
-bin_PROGRAMS= tr/tr tid/example/tidc tid/example/tids common/dh_test/dh_test
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+bin_PROGRAMS= tr/trust_router tid/example/tidc tid/example/tids common/dh_test/tr_dh_test
 AM_CPPFLAGS=-I$(srcdir)/include
+AM_CFLAGS = -Wall -Werror=missing-prototypes -Werror -Wno-parentheses
 SUBDIRS = gsscon 
 common_srcs = common/tr_name.c \
-common/tr_msg.c \
-common/tr_dh.c
+	common/tr_constraint.c \
+	common/jansson_iterators.h \
+	common/tr_msg.c \
+	common/tr_dh.c \
+	common/tr_util.c
+
+check_PROGRAMS = common/t_constraint
+TESTS = common/t_constraint
 
 lib_LTLIBRARIES = libtr_tid.la
 
-tr_tr_SOURCES = tr/tr_main.c \
-common/tr_config.c 
+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
+
+tr_trust_router_SOURCES = tr/tr_main.c \
+common/tr_config.c \
+common/tr_idp.c \
+common/tr_comm.c \
+common/tr_filter.c \
+common/tr_rp.c \
+tr/tr.c
 
-tr_tr_LDADD = gsscon/libgsscon.la libtr_tid.la
+tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la
 
 tid_example_tidc_SOURCES = tid/example/tidc_main.c 
 
@@ -20,21 +38,33 @@ tid_example_tids_SOURCES = tid/example/tids_main.c
 
 tid_example_tids_LDADD = gsscon/libgsscon.la libtr_tid.la
 
-common_dh_test_dh_test_SOURCES = common/tr_dh.c \
+common_dh_test_tr_dh_test_SOURCES = common/tr_dh.c \
 common/dh_test/dh_test.c
 
-libtr_tid_la_SOURCES = tid/tids.c tid/tidc.c \
+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
-libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 0 -no-undefined
+libtr_tid_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2 -no-undefined
 
 pkginclude_HEADERS = include/trust_router/tid.h include/trust_router/tr_name.h \
-include/trust_router/tr_versioning.h
+	include/trust_router/tr_dh.h \
+	include/trust_router/tr_constraint.h \
+	include/trust_router/tr_versioning.h 
 
 noinst_HEADERS = include/gsscon.h include/tr_config.h \
-include/tr_msg.h \
-include/tr.h \
-include/tr_dh.h
+	include/tr_debug.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_filter.h \
+	include/tid_internal.h
+
+pkgdata_DATA=schema.sql
+
+if HAVE_SYSTEMD
+	systemdsystemunit_DATA = tids.service
+endif
 
+EXTRA_DIST = trust_router.spec common/tests.json schema.sql tids.service