X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d9f71540958b836f88ac100026716b7fc647228e;hb=35d05b2ded37fda1aec6e7c144c07548081b9553;hp=949b175770108515985d07a15f2f89843216a106;hpb=ba234261ec0241a3279c2582e80d34d074b666f4;p=libradsec.git

diff --git a/Makefile.am b/Makefile.am
index 949b175..d9f7154 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 SUBDIRS = tests
 
 sbin_PROGRAMS = radsecproxy
-bin_PROGRAMS = catgconf
+bin_PROGRAMS = radsecproxy-conf
 noinst_LIBRARIES = librsp.a
 
 radsecproxy_SOURCES = main.c
@@ -24,35 +24,48 @@ librsp_a_SOURCES = \
 	udp.c udp.h \
 	util.c util.h
 
-if WANT_FTICKS
-librsp_a_SOURCES += fticks.c fticks.h
-endif
-
-catgconf_SOURCES = \
-	debug.c \
-	util.c \
-	gconfig.c \
-	catgconf.c
+radsecproxy_conf_SOURCES = \
+	catgconf.c \
+	debug.c debug.h \
+	gconfig.c gconfig.h \
+	util.c util.h
 
-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@
+
+####################
+if HAVE_DOCBOOK2X_MAN
+GENMANPAGES = radsecproxy.conf.5
+endif
 
 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
+	configure Makefile.in tests/Makefile.in \
+	compile config.guess config.sub install-sh missing depcomp
+EXTRA_DIST += \
+	LICENSE THANKS \
+	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
+DISTCHECK_CONFIGURE_FLAGS = --enable-fticks
+
+####################
+if WANT_FTICKS
+librsp_a_SOURCES += fticks.c fticks.h fticks_hashmac.c fticks_hashmac.h
+bin_PROGRAMS += radsecproxy-hash
+radsecproxy_hash_LDADD = fticks_hashmac.o hash.o list.o
+#radsecproxy_hash_LDFLAGS = @TARGET_LDFLAGS@
+dist_man_MANS += radsecproxy-hash.1
 endif
 
+####################
 radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
 	docbook2x-man $<
 
@@ -62,4 +75,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)