diff options
| author | Linus Nordberg <linus@nordu.net> | 2011-12-12 14:28:22 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2011-12-12 14:28:22 +0100 |
| commit | 7595c6d6f3f2be7635ba67ba151e42882984ef94 (patch) | |
| tree | f48e12a06a1a0c20425a59e5a09980be4306c679 /Makefile.am | |
| parent | c17e44da367ce2cf17c73342477387192aeab54e (diff) | |
Make the autoconfery slightly less miserable. Also, bump version.
Get rid of warnings about defining variables conditionally and unconditionally.
Don't redefine EXTRA_DIST with a spurious space in it.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index b9a9b8f..174d37f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,26 @@ 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 = radsecproxy-conf +bin_PROGRAMS = radsecproxy-conf $(fticks_programs) noinst_LIBRARIES = librsp.a radsecproxy_SOURCES = main.c librsp_a_SOURCES = \ + $(fticks_sources) \ debug.c debug.h \ dtls.c dtls.h \ gconfig.c gconfig.h \ @@ -39,31 +51,18 @@ radsecproxy_LDADD = librsp.a @SSL_LIBS@ 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 \ + 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 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 $< |