Skip to content

Commit

Permalink
Update to 1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Schiffman committed Apr 17, 2015
1 parent bf9c038 commit a5a1624
Show file tree
Hide file tree
Showing 59 changed files with 9,418 additions and 2,944 deletions.
2,291 changes: 2,291 additions & 0 deletions Doxyfile.in
View file

Large diffs are not rendered by default.

193 changes: 193 additions & 0 deletions DoxygenLayout.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,193 @@
<doxygenlayout version="1.0">
<!-- Generated by doxygen 1.8.6 -->
<!-- Navigation index tabs for HTML output -->
<navindex>
<tab type="mainpage" visible="yes" title=""/>
<tab type="pages" visible="yes" title="" intro=""/>
<tab type="modules" visible="yes" title="" intro=""/>
<tab type="namespaces" visible="yes" title="">
<tab type="namespacelist" visible="yes" title="" intro=""/>
<tab type="namespacemembers" visible="yes" title="" intro=""/>
</tab>
<tab type="classes" visible="yes" title="">
<tab type="classlist" visible="yes" title="" intro=""/>
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
<tab type="hierarchy" visible="yes" title="" intro=""/>
<tab type="classmembers" visible="yes" title="" intro=""/>
</tab>
<tab type="files" visible="yes" title="">
<tab type="filelist" visible="yes" title="" intro=""/>
<tab type="globals" visible="yes" title="" intro=""/>
</tab>
<tab type="examples" visible="yes" title="" intro=""/>
</navindex>

<!-- Layout definition for a class page -->
<class>
<briefdescription visible="yes"/>
<includes visible="$SHOW_INCLUDE_FILES"/>
<inheritancegraph visible="$CLASS_GRAPH"/>
<collaborationgraph visible="$COLLABORATION_GRAPH"/>
<memberdecl>
<nestedclasses visible="yes" title=""/>
<publictypes title=""/>
<services title=""/>
<interfaces title=""/>
<publicslots title=""/>
<signals title=""/>
<publicmethods title=""/>
<publicstaticmethods title=""/>
<publicattributes title=""/>
<publicstaticattributes title=""/>
<protectedtypes title=""/>
<protectedslots title=""/>
<protectedmethods title=""/>
<protectedstaticmethods title=""/>
<protectedattributes title=""/>
<protectedstaticattributes title=""/>
<packagetypes title=""/>
<packagemethods title=""/>
<packagestaticmethods title=""/>
<packageattributes title=""/>
<packagestaticattributes title=""/>
<properties title=""/>
<events title=""/>
<privatetypes title=""/>
<privateslots title=""/>
<privatemethods title=""/>
<privatestaticmethods title=""/>
<privateattributes title=""/>
<privatestaticattributes title=""/>
<friends title=""/>
<related title="" subtitle=""/>
<membergroups visible="yes"/>
</memberdecl>
<detaileddescription title=""/>
<memberdef>
<inlineclasses title=""/>
<typedefs title=""/>
<enums title=""/>
<services title=""/>
<interfaces title=""/>
<constructors title=""/>
<functions title=""/>
<related title=""/>
<variables title=""/>
<properties title=""/>
<events title=""/>
</memberdef>
<allmemberslink visible="yes"/>
<usedfiles visible="$SHOW_USED_FILES"/>
<authorsection visible="yes"/>
</class>

<!-- Layout definition for a namespace page -->
<namespace>
<briefdescription visible="yes"/>
<memberdecl>
<nestednamespaces visible="yes" title=""/>
<constantgroups visible="yes" title=""/>
<classes visible="yes" title=""/>
<typedefs title=""/>
<enums title=""/>
<functions title=""/>
<variables title=""/>
<membergroups visible="yes"/>
</memberdecl>
<detaileddescription title=""/>
<memberdef>
<inlineclasses title=""/>
<typedefs title=""/>
<enums title=""/>
<functions title=""/>
<variables title=""/>
</memberdef>
<authorsection visible="yes"/>
</namespace>

<!-- Layout definition for a file page -->
<file>
<briefdescription visible="yes"/>
<includes visible="$SHOW_INCLUDE_FILES"/>
<includegraph visible="$INCLUDE_GRAPH"/>
<includedbygraph visible="$INCLUDED_BY_GRAPH"/>
<sourcelink visible="yes"/>
<memberdecl>
<classes visible="yes" title=""/>
<namespaces visible="yes" title=""/>
<constantgroups visible="yes" title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<functions title=""/>
<variables title=""/>
<membergroups visible="yes"/>
</memberdecl>
<detaileddescription title=""/>
<memberdef>
<inlineclasses title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<functions title=""/>
<variables title=""/>
</memberdef>
<authorsection/>
</file>

<!-- Layout definition for a group page -->
<group>
<detaileddescription title=""/>
<groupgraph visible="$GROUP_GRAPHS"/>
<memberdecl>
<nestedgroups visible="yes" title=""/>
<dirs visible="yes" title=""/>
<files visible="yes" title=""/>
<namespaces visible="yes" title=""/>
<classes visible="yes" title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<enumvalues title=""/>
<functions title=""/>
<variables title=""/>
<signals title=""/>
<publicslots title=""/>
<protectedslots title=""/>
<privateslots title=""/>
<events title=""/>
<properties title=""/>
<friends title=""/>
<membergroups visible="yes"/>
</memberdecl>
<memberdef>
<pagedocs/>
<inlineclasses title=""/>
<defines title=""/>
<typedefs title=""/>
<enums title=""/>
<enumvalues title=""/>
<functions title=""/>
<variables title=""/>
<signals title=""/>
<publicslots title=""/>
<protectedslots title=""/>
<privateslots title=""/>
<events title=""/>
<properties title=""/>
<friends title=""/>
</memberdef>
<authorsection visible="yes"/>
</group>

<!-- Layout definition for a directory page -->
<directory>
<briefdescription visible="yes"/>
<directorygraph visible="yes"/>
<memberdecl>
<dirs visible="yes"/>
<files visible="yes"/>
</memberdecl>
<detaileddescription title=""/>
</directory>
</doxygenlayout>
72 changes: 57 additions & 15 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,43 @@ dist_config_DATA = etc/fields
MAN_PROCESS = $(AM_V_GEN) soelim -I. -I`dirname $<` -r $< | sed -e "s/^\.Dd.*/.Dd `date '+%B %d, %Y'`/" >$@
.man.1:
$(MAN_PROCESS)
.man.8:
$(MAN_PROCESS)

sratool/sratool.1: sratool/sratool.man \
fwd.man watch.man srawatch.man sratool/options.man sratool/cmds.man
sratool/radtool.1: sratool/radtool.man \
fwd.man watch.man radwatch.man sratool/options.man sratool/cmds.man
sratunnel/sratunnel.1: sratunnel/sratunnel.man fwd.man srawatch.man watch.man
sratunnel/radtunnel.1: sratunnel/radtunnel.man fwd.man srawatch.man watch.man

EXTRA_DIST += \
sratool/sratool.man \
sratool/radtool.man \
sratunnel/sratunnel.man \
sratunnel/radtunnel.man \
fwd.man \
watch.man \
srawatch.man \
radwatch.man \
sratool/options.man \
sratool/cmds.man \
sratool/axa_link_certs.man \
sratool/axa_make_cert.man \
sratool/axa_server_cert.man \
README.md \
doc/doxygen/doxygen-input-filter
Doxyfile.in \
DoxygenLayout.xml

dist_man_MANS = \
sratool/sratool.1 \
sratool/radtool.1 \
sratunnel/sratunnel.1
CLEANFILES += \
sratool/sratool.1 \
sratool/radtool.1 \
sratunnel/sratunnel.1
sratunnel/sratunnel.1 \
sratunnel/radtunnel.1 \
sratool/axa_link_certs.8 \
sratool/axa_make_cert.8 \
sratool/axa_server_cert.8
CLEANFILES += $(dist_man_MANS)

#
##
Expand Down Expand Up @@ -104,6 +113,7 @@ axa_libaxa_la_SOURCES = \
axalib/parse_ch.c \
axalib/socket.c \
axalib/time.c \
axalib/tls.c \
axalib/trie.c \
axalib/wdns_res.c \
axalib/wdns_rtype.c \
Expand All @@ -113,12 +123,16 @@ axa_libaxa_la_SOURCES = \
axa_libaxa_la_LDFLAGS = $(AM_LDFLAGS) \
-version-info $(LIBAXA_CURRENT):$(LIBAXA_REVISION):$(LIBAXA_AGE) \
-export-symbols-regex "^(axa_[a-z].*)" \
${libssl_LIBS} \
${libcrypto_LIBS} \
${libpcap_LIBS} \
${libwdns_LIBS} \
${libnmsg_LIBS} \
${strlcpy_LIBS}
axa_libaxa_la_CFLAGS = \
${AM_CFLAGS} \
${libssl_CFLAGS} \
${libcrypto_CFLAGS} \
${libpcap_CFLAGS} \
${libwdns_CFLAGS} \
${libnmsg_CFLAGS} \
Expand Down Expand Up @@ -149,16 +163,20 @@ sratool_sratool_SOURCES = \
sratool/sratool.h
sratool_sratool_LDADD = \
axa/libaxa.la \
${libprotobuf_c_LIBS} \
${libssl_LIBS} \
${libcrypto_LIBS} \
${libpcap_LIBS} \
${libprotobuf_c_LIBS} \
${libnmsg_LIBS} \
${libz_LIBS} \
${libwdns_LIBS} \
${libedit_LIBS}
sratool_sratool_CFLAGS = \
${AM_CFLAGS} \
${libprotobuf_c_CFLAGS} \
${libssl_CFLAGS} \
${libcrypto_CFLAGS} \
${libpcap_CFLAGS} \
${libprotobuf_c_CFLAGS} \
${libnmsg_CFLAGS} \
${libz_CFLAGS} \
${libwdns_CFLAGS} \
Expand All @@ -175,12 +193,32 @@ sratunnel_sratunnel_SOURCES = \
sratunnel_sratunnel_LDADD = \
axa/libaxa.la \
${libnmsg_LIBS} \
${libssl_LIBS} \
${libcrypto_LIBS} \
${libpcap_LIBS}
sratunnel_sratunnel_CFLAGS = \
${AM_CFLAGS} \
${libnmsg_CFLAGS} \
${libssl_CFLAGS} \
${libcrypto_CFLAGS} \
${libpcap_CFLAGS}

bin_PROGRAMS += sratunnel/radtunnel
sratunnel_radtunnel_SOURCES = ${sratunnel_sratunnel_SOURCES}
sratunnel_radtunnel_LDADD = ${sratunnel_sratunnel_LDADD}
sratunnel_radtunnel_CFLAGS = ${sratunnel_sratunnel_CFLAGS}

#
##
### scripts
##
#

bin_SCRIPTS = \
sratool/axa_link_certs \
sratool/axa_make_cert \
sratool/axa_server_cert

#
##
### documentation
Expand All @@ -205,14 +243,18 @@ EXTRA_DIST += \
sratunnel/README

if HAVE_DOXYGEN
html-local: doc/doxygen/Doxyfile
$(AM_V_GEN) cd doc/doxygen && $(DOXYGEN)
endif

stamp-html: $(DOXYGEN_INPUT_FILES) $(top_builddir)/Doxyfile $(top_srcdir)/DoxygenLayout.xml $(include_HEADERS) $(nobase_include_HEADERS)
$(AM_V_GEN) $(DOXYGEN)
@touch $@
html-local: stamp-html
doc: html-local
clean-local:
rm -rf $(top_builddir)/html $(top_builddir)/stamp-html
endif

spotless: distclean
rm -fr ar-lib aclocal.m4 autom4te.cache configure config.* Makefile.in \
autoscan.log config.h compile depcomp configure.scan \
doc/doxygen/Doxyfile missing install-sh ltmain.sh
rm -fr ar-lib aclocal.m4 autom4te.cache configure config.* Makefile.in \
autoscan.log config.h compile depcomp configure.scan \
missing install-sh ltmain.sh $(top_builddir)/html \
$(top_builddir)/stamp-html

Loading

0 comments on commit a5a1624

Please sign in to comment.