Cosmetic.

[radsecproxy.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e2ab1e0..a309d42 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,54 +1,59 @@
 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 @SSL_CFLAGS@ @TARGET_CFLAGS@
+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
+
+if WANT_FTICKS
+librsp_a_SOURCES += fticks.c fticks.h
+endif
+
+radsecproxy_conf_SOURCES = \
+       catgconf.c \
+       debug.c debug.h \
+       gconfig.c gconfig.h \
+       util.c util.h
+
+librsp_a_CFLAGS = \
+       -g -Wall -Werror -fno-strict-aliasing @SSL_CFLAGS@ @TARGET_CFLAGS@
+radsecproxy_CFLAGS = $(librsp_a_CFLAGS)
 radsecproxy_LDFLAGS = @SSL_LDFLAGS@ @TARGET_LDFLAGS@
-radsecproxy_LDADD   = @SSL_LIBS@
+radsecproxy_LDADD = librsp.a @SSL_LIBS@
+
+radsecproxy_conf_CFLAGS = -g -Wall -fno-strict-aliasing @TARGET_CFLAGS@
+radsecproxy_conf_LDFLAGS = @TARGET_LDFLAGS@
 
-catgconf_CFLAGS     = -g -Wall @TARGET_CFLAGS@
-catgconf_LDFLAGS    = @TARGET_LDFLAGS@
+dist_man_MANS = radsecproxy.1 $(GENMANPAGES)
+EXTRA_DIST = \
+       LICENSE THANKS \
+       radsecproxy.conf.5.xml radsecproxy.conf-example \
+       tools/README tools/naptr-eduroam.sh tools/radsec-dynsrv.sh
 
-EXTRA_DIST = radsecproxy.conf-example \
-               radsecproxy.1 \
-               radsecproxy.conf.5.xml
+if HAVE_DOCBOOK2X_MAN
+GENMANPAGES = radsecproxy.conf.5
+endif
 
-man: $(srcdir)/radsecproxy.conf.5.xml
+radsecproxy.conf.5: $(srcdir)/radsecproxy.conf.5.xml
        docbook2x-man $<
 
 # Build HTML version of radsecproxy.conf.5.  NOTE: Only tested with