X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=174d37ff18c57201caf8661a6b7f69d81d392ce5;hb=68d851156019f743618b39d31f7674981ed18a71;hp=f83295c6938761b97b93b8e98e501eb486727d13;hpb=ae485fd8711bff7147853515fcf9a8e04c217c5d;p=libradsec.git

diff --git a/Makefile.am b/Makefile.am
index f83295c..174d37f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,58 +1,68 @@
 AUTOMAKE_OPTIONS = foreign
 
+if WANT_FTICKS
+fticks_sources = fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
+fticks_programs = radsecproxy-hash
+radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
+endif
+
+if HAVE_DOCBOOK2X_MAN
+GENMANPAGES = radsecproxy.conf.5
+endif
+
 SUBDIRS = tests
 
+
 sbin_PROGRAMS = radsecproxy
-bin_PROGRAMS = catgconf
+bin_PROGRAMS = radsecproxy-conf $(fticks_programs)
 noinst_LIBRARIES = librsp.a
 
 radsecproxy_SOURCES = main.c
 
 librsp_a_SOURCES = \
-	radsecproxy.c \
-	tlscommon.c \
-	gconfig.c \
-	util.c \
-	debug.c \
-	list.c \
-	hash.c \
-	tlv11.c \
-	hostport.c \
-	radmsg.c \
-	udp.c \
-	tcp.c \
-	tls.c \
-	dtls.c
+	$(fticks_sources) \
+	debug.c debug.h \
+	dtls.c dtls.h \
+	gconfig.c gconfig.h \
+	hash.c hash.h \
+	hostport.c hostport.h \
+	list.c list.h \
+	radmsg.c radmsg.h \
+	radsecproxy.c radsecproxy.h \
+	tcp.c tcp.h \
+	tls.c tls.h \
+	tlscommon.c tlscommon.h \
+	tlv11.c tlv11.h \
+	udp.c udp.h \
+	util.c util.h
 
-if WANT_FTICKS
-librsp_a_SOURCES += fticks.c
-endif
+radsecproxy_conf_SOURCES = \
+	catgconf.c \
+	debug.c debug.h \
+	gconfig.c gconfig.h \
+	util.c util.h
 
-catgconf_SOURCES = \
-	debug.c \
-	util.c \
-	gconfig.c \
-	catgconf.c
-
-librsp_a_CFLAGS = \
+####################
+AM_CFLAGS = \
 	-g -Wall -Werror -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
-librsp_a_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
-radsecproxy_CFLAGS = $(librsp_a_CFLAGS)
-radsecproxy_LDFLAGS = $(librsp_a_LDFLAGS)
+
+radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
 radsecproxy_LDADD = librsp.a @SSL_LIBS@
 
-catgconf_CFLAGS = -g -Wall -fno-strict-aliasing @TARGET_CFLAGS@
-catgconf_LDFLAGS = @TARGET_LDFLAGS@
+radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
+
+dist_man_MANS = radsecproxy.1 radsecproxy-hash.1 $(GENMANPAGES)
 
-dist_man_MANS = radsecproxy.1 $(GENMANPAGES)
 EXTRA_DIST = \
-	LICENSE THANKS radsecproxy.conf-example radsecproxy.conf.5.xml \
-	tools/naptr-eduroam.sh tools/radsec-dynsrv.sh tools/README
+	LICENSE THANKS \
+	configure Makefile.in tests/Makefile.in \
+	compile config.guess config.sub install-sh missing depcomp \
+	radsecproxy.conf.5.xml radsecproxy.conf-example \
+	tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
 
-if HAVE_DOCBOOK2X_MAN
-GENMANPAGES = radsecproxy.conf.5
-endif
+DISTCHECK_CONFIGURE_FLAGS = --enable-fticks
 
+####################
 radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
 	docbook2x-man $<
 
@@ -62,4 +72,4 @@ html: $(srcdir)/radsecproxy.conf.5.xml
 	-openjade -E2000 -t sgml-raw -d /usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl -o radsecproxy.conf.html $<
 
 clean-local:
-	-rm radsecproxy.conf.5
+	-rm $(GENMANPAGES)