X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=1de53be3b472207ce01b97b36175595719dd319e;hb=39c2dec6054da6fb692b40f6b5ac374795b17092;hp=9fbe65a9e0027f8ba6bf5883eefd84f6c19bad20;hpb=a424740cc7859cf1d4118ce36c77133952a9c581;p=trust_router.git

diff --git a/Makefile.am b/Makefile.am
index 9fbe65a..1de53be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,15 @@
+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
+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_constraint.c \
 	common/jansson_iterators.h \
 	common/tr_msg.c \
 	common/tr_dh.c \
+        common/tr_debug.c \
 	common/tr_util.c
 
 check_PROGRAMS = common/t_constraint
@@ -26,27 +29,29 @@ common/tr_filter.c \
 common/tr_rp.c \
 tr/tr.c
 
-tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la
+tr_trust_router_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS)
 
 tid_example_tidc_SOURCES = tid/example/tidc_main.c 
 
-tid_example_tidc_LDADD = gsscon/libgsscon.la libtr_tid.la
+tid_example_tidc_LDADD = gsscon/libgsscon.la libtr_tid.la $(GLIB_LIBS)
 
 tid_example_tids_SOURCES = tid/example/tids_main.c 
 
 tid_example_tids_LDADD = gsscon/libgsscon.la libtr_tid.la
 
 common_dh_test_tr_dh_test_SOURCES = common/tr_dh.c \
+common/tr_debug.c \
 common/dh_test/dh_test.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_LIBADD = gsscon/libgsscon.la $(GLIB_LIBS)
 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/tr_debug.h \
 	include/trust_router/tr_dh.h \
 	include/trust_router/tr_constraint.h \
 	include/trust_router/tr_versioning.h 
@@ -59,9 +64,12 @@ noinst_HEADERS = include/gsscon.h include/tr_config.h \
 	include/tid_internal.h
 
 pkgdata_DATA=schema.sql
-systemddir=/lib/systemd/system
+nobase_dist_pkgdata_DATA=redhat/init redhat/sysconfig redhat/trusts.cfg redhat/tidc-wrapper redhat/trust_router-wrapper redhat/tr-test-main.cfg redhat/default-main.cfg redhat/tids-wrapper redhat/sysconfig.tids
 
-systemd_DATA=tids.service
+if HAVE_SYSTEMD
+systemdsystemunit_DATA = tids.service
+endif
 
-
-EXTRA_DIST = trust_router.spec common/tests.json
+EXTRA_DIST = trust_router.spec common/tests.json schema.sql tids.service \
+	tr/manual.cfg tr/portal.cfg \
+	redhat/tids.init