Commit 194aa161 authored by Philipp Schafft's avatar Philipp Schafft 🦁

Merge branch 'autotools-cleanup'

parents f89e85c7 e0c227d4
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign dist-zip
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src conf doc web admin win32 examples tests
EXTRA_DIST = README.md HACKING m4/acx_pthread.m4 m4/ogg.m4 \
m4/theora.m4 m4/vorbis.m4 m4/speex.m4 \
m4/xiph_compiler.m4 m4/xiph_curl.m4 m4/xiph_net.m4 \
m4/xiph_types.m4 m4/xiph_xml2.m4
EXTRA_DIST = README.md HACKING
docdir = $(datadir)/doc/$(PACKAGE)
doc_DATA = README.md AUTHORS COPYING NEWS ChangeLog
debug:
$(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
static:
$(MAKE) all LDFLAGS="${LDFLAGS} -all-static"
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = includes
admindir = $(pkgdatadir)/admin
dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl
nobase_dist_admin_DATA = listclients.xsl listmounts.xsl moveclients.xsl response.xsl \
stats.xsl manageauth.xsl updatemetadata.xsl xspf.xsl vclt.xsl includes/footer.xsl \
includes/head.xsl includes/header.xsl includes/page.xsl includes/mountnav.xsl
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
admindir = $(pkgdatadir)/admin
otheradmindir = $(admindir)/includes
otheradmin_DATA = footer.xsl head.xsl header.xsl page.xsl mountnav.xsl
EXTRA_DIST = $(otheradmin_DATA)
## Process this with automake to create Makefile.in
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = icecast.xml.in icecast_minimal.xml.in icecast_shoutcast_compat.xml.in icecast_urlauth.xml.in
DISTCLEANFILES = icecast.xml.dist icecast_minimal.xml.dist icecast_shoutcast_compat.xml.dist icecast_urlauth.xml.dist
......
This diff is collapsed.
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc/$(PACKAGE)
docdir = $(datadir)/doc/icecast
nobase_doc_DATA = index.html \
admin_interface/index.html \
auth/index.html \
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = icecast_auth-1.0.tar.gz
Subproject commit 57027c6cc3f8b26d59e9560b4ac72a1a06d643b9
Subproject commit 541d6079634c420ea757687715580fa199a0e3f0
## Process this with automake to create Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = common/avl common/net common/thread common/httpp common/log common/timing
bin_PROGRAMS = icecast
noinst_HEADERS = admin.h cfgfile.h logging.h sighandler.h connection.h \
global.h util.h errors.h curl.h slave.h source.h stats.h refbuf.h client.h playlist.h \
compat.h fserve.h xslt.h yp.h md5.h matchfile.h tls.h \
event.h event_log.h event_exec.h event_url.h \
noinst_HEADERS = \
admin.h \
cfgfile.h \
logging.h \
sighandler.h \
connection.h \
global.h \
util.h \
errors.h \
curl.h \
slave.h \
source.h \
stats.h \
refbuf.h \
client.h \
playlist.h \
compat.h \
fserve.h \
xslt.h \
yp.h \
md5.h \
matchfile.h \
tls.h \
event.h \
event_log.h \
event_exec.h \
event_url.h \
acl.h auth.h \
format.h format_ogg.h format_mp3.h format_ebml.h \
format_vorbis.h format_theora.h format_flac.h format_speex.h format_midi.h \
format_kate.h format_skeleton.h format_opus.h
icecast_SOURCES = cfgfile.c main.c logging.c sighandler.c connection.c global.c \
util.c errors.c slave.c source.c stats.c refbuf.c client.c playlist.c \
xslt.c fserve.c admin.c md5.c matchfile.c tls.c \
format.c format_ogg.c format_mp3.c format_midi.c format_flac.c format_ebml.c \
format_kate.c format_skeleton.c format_opus.c \
event.c event_log.c event_exec.c \
acl.c auth.c auth_htpasswd.c auth_anonymous.c auth_static.c
EXTRA_icecast_SOURCES = curl.c yp.c \
auth_url.c event_url.c \
format_vorbis.c format_theora.c format_speex.c
icecast_DEPENDENCIES = @ICECAST_OPTIONAL@ common/net/libicenet.la common/thread/libicethread.la \
common/httpp/libicehttpp.la common/log/libicelog.la common/avl/libiceavl.la common/timing/libicetiming.la
icecast_LDADD = $(icecast_DEPENDENCIES) @XIPH_LIBS@ @KATE_LIBS@
AM_CFLAGS = @XIPH_CFLAGS@
AM_CPPFLAGS = -I$(srcdir)/common/ @XIPH_CPPFLAGS@
AM_LDFLAGS = @XIPH_LDFLAGS@ @KATE_LIBS@
debug:
$(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
format.h \
format_ogg.h \
format_mp3.h \
format_ebml.h \
format_vorbis.h \
format_theora.h \
format_flac.h \
format_speex.h \
format_midi.h \
format_kate.h \
format_skeleton.h \
format_opus.h
icecast_SOURCES = \
main.c \
cfgfile.c \
logging.c \
sighandler.c \
connection.c \
global.c \
util.c \
errors.c \
slave.c \
source.c \
stats.c \
refbuf.c \
client.c \
playlist.c \
xslt.c \
fserve.c \
admin.c \
md5.c \
matchfile.c \
tls.c \
format.c \
format_ogg.c \
format_mp3.c \
format_midi.c \
format_flac.c \
format_ebml.c \
format_kate.c \
format_skeleton.c \
format_opus.c \
event.c \
event_log.c \
event_exec.c \
acl.c \
auth.c \
auth_htpasswd.c \
auth_anonymous.c \
auth_static.c
if HAVE_CURL
icecast_SOURCES += \
curl.c \
auth_url.c \
event_url.c
endif
if ENABLE_YP
icecast_SOURCES += yp.c
endif
if HAVE_OGG
icecast_SOURCES += format_vorbis.c
endif
if HAVE_THEORA
icecast_SOURCES += format_theora.c
endif
if HAVE_SPEEX
icecast_SOURCES += format_speex.c
endif
EXTRA_icecast_SOURCES = \
curl.c \
yp.c \
auth_url.c \
event_url.c \
format_vorbis.c \
format_theora.c \
format_speex.c
icecast_DEPENDENCIES = \
common/net/libicenet.la \
common/thread/libicethread.la \
common/httpp/libicehttpp.la \
common/log/libicelog.la \
common/avl/libiceavl.la \
common/timing/libicetiming.la
icecast_LDADD = $(icecast_DEPENDENCIES)
icecast_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/common
......@@ -438,7 +438,7 @@ static int get_authenticator (auth_t *auth, config_options_t *options)
ICECAST_LOG_DEBUG("type is %s", auth->type);
if (strcmp(auth->type, AUTH_TYPE_URL) == 0) {
#ifdef HAVE_AUTH_URL
#ifdef HAVE_CURL
if (auth_get_url_auth(auth, options) < 0)
return -1;
break;
......
......@@ -47,11 +47,12 @@
# define PRId64 "I64d"
#else
# define PATH_SEPARATOR "/"
# if defined(HAVE_INTTYPES_H)
# include <inttypes.h>
# elif defined(HAVE_STDINT_H)
# ifdef HAVE_STDINT_H
# include <stdint.h>
# endif
# ifdef HAVE_INTTYPES_H
# include <inttypes.h>
# endif
#endif
/* some defaults if not provided above */
......
......@@ -247,7 +247,7 @@ event_registration_t * event_new_from_xml_node(xmlNodePtr node) {
rv = event_get_log(ret, options);
} else if (strcmp(ret->type, EVENT_TYPE_EXEC) == 0) {
rv = event_get_exec(ret, options);
#ifdef HAVE_AUTH_URL
#ifdef HAVE_CURL
} else if (strcmp(ret->type, EVENT_TYPE_URL) == 0) {
rv = event_get_url(ret, options);
#endif
......
......@@ -21,8 +21,6 @@
#include <ogg/ogg.h>
#include <string.h>
typedef struct source_tag source_t;
#include "refbuf.h"
#include "format_ogg.h"
#include "client.h"
......
......@@ -20,11 +20,6 @@
#include <stdlib.h>
#include <string.h>
#include <ogg/ogg.h>
#ifdef HAVE_KATE
#include <kate/oggkate.h>
#endif
typedef struct source_tag source_t;
#include "refbuf.h"
#include "format_ogg.h"
......@@ -39,10 +34,6 @@ typedef struct source_tag source_t;
typedef struct _kate_codec_tag
{
int headers_done;
#ifdef HAVE_KATE
kate_info ki;
kate_comment kc;
#endif
int num_headers;
int granule_shift;
ogg_int64_t last_iframe;
......@@ -61,10 +52,6 @@ static void kate_codec_free (ogg_state_t *ogg_info, ogg_codec_t *codec)
stats_event (ogg_info->mount, "frame_rate", NULL);
stats_event (ogg_info->mount, "frame_size", NULL);
*/
#ifdef HAVE_KATE
kate_info_clear (&kate->ki);
kate_comment_clear (&kate->kc);
#endif
ogg_stream_clear (&codec->os);
free (kate);
free (codec);
......@@ -93,35 +80,6 @@ static refbuf_t *process_kate_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o
{
if (!kate->headers_done)
{
#ifdef HAVE_KATE
int ret = kate_ogg_decode_headerin (&kate->ki, &kate->kc, &packet);
if (ret < 0)
{
ogg_info->error = 1;
ICECAST_LOG_WARN("problem with kate header");
return NULL;
}
header_page = 1;
kate->num_headers = kate->ki.num_headers;
codec->headers++;
if (ret > 0)
{
kate->headers_done = 1;
/* TODO: what to replace this with ?
ogg_info->bitrate += theora->ti.target_bitrate;
stats_event_args (ogg_info->mount, "video_bitrate", "%ld",
(long)theora->ti.target_bitrate);
stats_event_args (ogg_info->mount, "video_quality", "%ld",
(long)theora->ti.quality);
stats_event_args (ogg_info->mount, "frame_size", "%ld x %ld",
(long)theora->ti.frame_width,
(long)theora->ti.frame_height);
stats_event_args (ogg_info->mount, "frame_rate", "%.2f",
(float)theora->ti.fps_numerator/theora->ti.fps_denominator);
*/
}
continue;
#else
header_page = (packet.bytes > 0 && (packet.packet[0] & 0x80));
if (!header_page)
break;
......@@ -133,7 +91,6 @@ static refbuf_t *process_kate_page (ogg_state_t *ogg_info, ogg_codec_t *codec, o
kate->num_headers = packet.packet[11];
}
continue;
#endif
}
if (codec->headers < kate->num_headers)
......@@ -189,25 +146,9 @@ ogg_codec_t *initial_kate_page(format_plugin_t *plugin, ogg_page *page)
ogg_stream_init(&codec->os, ogg_page_serialno(page));
ogg_stream_pagein(&codec->os, page);
#ifdef HAVE_KATE
kate_info_init (&kate_codec->ki);
kate_comment_init (&kate_codec->kc);
#endif
ogg_stream_packetout(&codec->os, &packet);
ICECAST_LOG_DEBUG("checking for kate codec");
#ifdef HAVE_KATE
if (kate_ogg_decode_headerin (&kate_codec->ki, &kate_codec->kc, &packet) < 0)
{
kate_info_clear (&kate_codec->ki);
kate_comment_clear (&kate_codec->kc);
ogg_stream_clear (&codec->os);
free (kate_codec);
free (codec);
return NULL;
}
#else
/* we don't have libkate, so we examine the packet magic by hand */
if ((packet.bytes<9) || memcmp(packet.packet, "\x80kate\0\0\0\0", 9))
{
......@@ -216,7 +157,6 @@ ogg_codec_t *initial_kate_page(format_plugin_t *plugin, ogg_page *page)
free (codec);
return NULL;
}
#endif
ICECAST_LOG_INFO("seen initial kate header");
codec->specific = kate_codec;
......
......@@ -21,8 +21,6 @@
#include <ogg/ogg.h>
#include <string.h>
typedef struct source_tag source_t;
#include "refbuf.h"
#include "format_ogg.h"
#include "client.h"
......
......@@ -20,8 +20,6 @@
#include <string.h>
#include <ogg/ogg.h>
typedef struct source_tag source_t;
#include "format_opus.h"
#include "stats.h"
#include "refbuf.h"
......
......@@ -21,8 +21,6 @@
#include <string.h>
#include <ogg/ogg.h>
typedef struct source_tag source_t;
#include "refbuf.h"
#include "format_ogg.h"
#include "format_skeleton.h"
......
......@@ -21,8 +21,6 @@
#include <ogg/ogg.h>
#include <speex/speex_header.h>
typedef struct source_tag source_t;
#include "format_speex.h"
#include "refbuf.h"
#include "client.h"
......
......@@ -21,8 +21,6 @@
#include <ogg/ogg.h>
#include <theora/theora.h>
typedef struct source_tag source_t;
#include "refbuf.h"
#include "format_ogg.h"
#include "format_theora.h"
......
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
webdir = $(pkgdatadir)/web
SUBDIRS = assets
nobase_web_DATA = \
status.xsl \
favicon.ico \
icecast.png \
style.css \
auth.xsl \
server_version.xsl \
tunein.png \
key.png \
status-json.xsl \
xml2json.xslt \
assets/css/style.css \
assets/font/FiraMono-Bold.eot \
assets/font/FiraMono-Regular.eot \
assets/font/FiraSans-Bold.eot \
assets/font/FiraSans-BoldItalic.woff \
assets/font/FiraSans-Italic.eot \
assets/font/FiraSans-Regular.eot \
assets/font/FiraMono-Bold.woff \
assets/font/FiraMono-Regular.woff \
assets/font/FiraSans-BoldItalic.eot \
assets/font/FiraSans-Bold.woff \
assets/font/FiraSans-Italic.woff \
assets/font/FiraSans-Regular.woff
webdir = $(pkgdatadir)/web
web_DATA = status.xsl \
favicon.ico \
icecast.png \
style.css \
auth.xsl \
server_version.xsl \
tunein.png \
key.png \
status-json.xsl \
xml2json.xslt
EXTRA_DIST = $(web_DATA)
EXTRA_DIST = $(nobase_web_DATA)
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
SUBDIRS = css font
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
webdir = $(pkgdatadir)/web
otherwebdir = $(webdir)/assets/css
otherweb_DATA = style.css
EXTRA_DIST = $(otherweb_DATA)
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
webdir = $(pkgdatadir)/web
otherwebdir = $(webdir)/assets/font
otherweb_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 = $(otherweb_DATA)
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = foreign
EXTRA_DIST = dllbundler.sh icecast2logo2.bmp icecast2logo3.bmp \
icecast2title.bmp icecast.ico icecast.nsis
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment