X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=b9a9b8f06f767dedd49e26cc5b7cfc92f5417c53;hb=a9da84af5738e8eb5b8751cb4d6c00d1beb2810d;hp=cd40c2ae007bf96c7057fd42c6294b36e74669cc;hpb=b08b01c29daaae1146568190afbce4ea949e2934;p=libradsec.git

diff --git a/Makefile.am b/Makefile.am
index cd40c2a..b9a9b8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,57 +1,69 @@
 AUTOMAKE_OPTIONS = foreign
 
+SUBDIRS = tests
+
 sbin_PROGRAMS = radsecproxy
-bin_PROGRAMS  = catgconf
-
-radsecproxy_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 \
-                      radsecproxy.h \
-                      tlscommon.h \
-                      gconfig.h \
-                      debug.h \
-                      util.h \
-                      list.h \
-                      hash.h \
-                      tlv11.h \
-                      hostport.h \
-                      radmsg.h \
-                      udp.h \
-                      tcp.h \
-                      tls.h \
-                      dtls.h
-
-catgconf_SOURCES    = debug.c \
-                      util.c \
-                      gconfig.c \
-                      catgconf.c
-
-radsecproxy_CFLAGS  = -g -Wall -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
-radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
-radsecproxy_LDADD   = @SSL_LIBS@
+bin_PROGRAMS = radsecproxy-conf
+noinst_LIBRARIES = librsp.a
+
+radsecproxy_SOURCES = main.c
+
+librsp_a_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
+
+radsecproxy_conf_SOURCES = \
+	catgconf.c \
+	debug.c debug.h \
+	gconfig.c gconfig.h \
+	util.c util.h
+
+####################
+AM_CFLAGS = \
+	-g -Wall -Werror -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
 
-catgconf_CFLAGS     = -g -Wall -fno-strict-aliasing @TARGET_CFLAGS@
-catgconf_LDFLAGS    = @TARGET_LDFLAGS@
+radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
+radsecproxy_LDADD = librsp.a @SSL_LIBS@
 
-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
+radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
 
+####################
 if HAVE_DOCBOOK2X_MAN
 GENMANPAGES = radsecproxy.conf.5
 endif
 
+dist_man_MANS = radsecproxy.1 radsecproxy-hash.1 $(GENMANPAGES)
+
+EXTRA_DIST = \
+	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
+
+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
+endif
+
+####################
 radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
 	docbook2x-man $<
 
@@ -61,4 +73,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)