From 92dfbc5be532c5bead0eb616369f73ca060819aa Mon Sep 17 00:00:00 2001 From: "Thomas B. \"dm8tbr\" Ruecker" Date: Wed, 19 Nov 2014 13:41:09 +0000 Subject: [PATCH] Makefile.am and configure.in for new docs svn path=/icecast/trunk/icecast/; revision=19324 --- configure.in | 6 ++++-- doc/Makefile.am | 11 +++++------ doc/assets/Makefile.am | 5 +++++ doc/assets/css/Makefile.am | 8 ++++++++ doc/assets/font/Makefile.am | 13 +++++++++++++ doc/assets/img/Makefile.am | 8 ++++++++ doc/img/Makefile.am | 8 ++++++++ 7 files changed, 51 insertions(+), 8 deletions(-) create mode 100644 doc/assets/Makefile.am create mode 100644 doc/assets/css/Makefile.am create mode 100644 doc/assets/font/Makefile.am create mode 100644 doc/assets/img/Makefile.am create mode 100644 doc/img/Makefile.am diff --git a/configure.in b/configure.in index e6ce9559..b13bc36c 100644 --- a/configure.in +++ b/configure.in @@ -155,5 +155,7 @@ AC_SUBST(KATE_LIBS) AC_OUTPUT([Makefile conf/Makefile src/Makefile src/avl/Makefile src/httpp/Makefile src/thread/Makefile src/log/Makefile -src/net/Makefile src/timing/Makefile doc/Makefile web/Makefile -admin/Makefile win32/Makefile win32/res/Makefile examples/Makefile]) +src/net/Makefile src/timing/Makefile doc/Makefile doc/img/Makefile +doc/assets/Makefile doc/assets/css/Makefile doc/assets/font/Makefile +doc/assets/img/Makefile web/Makefile admin/Makefile win32/Makefile +win32/res/Makefile examples/Makefile]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c11ff7c..3b559ed0 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,12 +2,11 @@ AUTOMAKE_OPTIONS = foreign +SUBDIRS = assets img + docdir = $(datadir)/doc/icecast -doc_DATA = index.html icecast2_admin.html icecast2_basicsetup.html \ - icecast2_config_file.html icecast2_faq.html icecast2_glossary.html \ - icecast2_introduction.html icecast2_relay.html icecast2_stats.html \ - icecast2_win32.html icecast2_yp.html icecast2_auth.html icecast2_changes.html \ - listener_auth1.jpg listener_auth2.jpg listener_auth3.jpg \ - masterslave.png relay.png +doc_DATA = admin-interface.html auth.html changes.html faq.html \ + introduction.html relaying.html win32.html basic-setup.html \ + config-file.html glossary.html index.html server-stats.html yp.html EXTRA_DIST = $(doc_DATA) diff --git a/doc/assets/Makefile.am b/doc/assets/Makefile.am new file mode 100644 index 00000000..e4ef4d11 --- /dev/null +++ b/doc/assets/Makefile.am @@ -0,0 +1,5 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +SUBDIRS = css font img diff --git a/doc/assets/css/Makefile.am b/doc/assets/css/Makefile.am new file mode 100644 index 00000000..c5ecd651 --- /dev/null +++ b/doc/assets/css/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +docdir = $(datadir)/doc/icecast/assets/css +doc_DATA = style.css + +EXTRA_DIST = $(doc_DATA) diff --git a/doc/assets/font/Makefile.am b/doc/assets/font/Makefile.am new file mode 100644 index 00000000..56bb7c1e --- /dev/null +++ b/doc/assets/font/Makefile.am @@ -0,0 +1,13 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +docdir = $(datadir)/doc/icecast/assets/font +doc_DATA = FiraMono-Bold.eot FiraMono-Regular.eot \ + FiraSans-Bold.eot FiraSans-BoldItalic.woff \ + FiraSans-Italic.eot FiraSans-Regular.eot \ + FiraMono-Bold.woff FiraMono-Regular.woff \ + FiraSans-BoldItalic.eot FiraSans-Bold.woff \ + FiraSans-Italic.woff FiraSans-Regular.woff + +EXTRA_DIST = $(doc_DATA) diff --git a/doc/assets/img/Makefile.am b/doc/assets/img/Makefile.am new file mode 100644 index 00000000..f4c17ee0 --- /dev/null +++ b/doc/assets/img/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +docdir = $(datadir)/doc/icecast/assets/img +doc_DATA = xiph-community.svg + +EXTRA_DIST = $(doc_DATA) diff --git a/doc/img/Makefile.am b/doc/img/Makefile.am new file mode 100644 index 00000000..4ca114b1 --- /dev/null +++ b/doc/img/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +docdir = $(datadir)/doc/icecast/img +doc_DATA = listener_auth1.png listener_auth2.png listener_auth3.png masterslave.png relay.png + +EXTRA_DIST = $(doc_DATA)