From 68dea2dc718e7edbb3487967b8b9e1757fad8ff6 Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Tue, 24 Sep 2002 08:16:24 +0000 Subject: [PATCH] build updates. svn path=/trunk/icecast/; revision=3945 --- Makefile.am | 2 +- TODO | 11 +++++++++-- configure.in | 4 ++-- doc/Makefile.am | 8 ++++++++ src/Makefile.am | 2 +- web/Makefile.am | 6 ++++++ win32/Makefile.am | 14 ++++++++++++++ win32/res/Makefile.am | 6 ++++++ 8 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 doc/Makefile.am create mode 100644 web/Makefile.am create mode 100644 win32/Makefile.am create mode 100644 win32/res/Makefile.am diff --git a/Makefile.am b/Makefile.am index f62d6fae..5dcd14f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign dist-zip -SUBDIRS = src conf +SUBDIRS = src conf doc web win32 EXTRA_DIST = README AUTHORS COPYING diff --git a/TODO b/TODO index 3ba203b1..633be566 100644 --- a/TODO +++ b/TODO @@ -2,14 +2,21 @@ BUGS ---- - stats get off? this needs testing more testing. -- autoconf doesn't set HAS_POLL +- autoconf doesn't set HAVE_POLL - automake isn't installing things (conf, web) correctly. +- some stuff (like 'genre') isn't making it into the stats dump + +- thread_join uses thread->sys_thread, but thread structure has + already been freed in thread_exit() + FEATURES -------- -- pull out vorbis comments. and send to stats. + +- pull out vorbis comments. and send to stats. This seems to be being + done, but it isn't working right. - directory server GUID checks directory server does GET /GUID-asldjfasldfjalsdkfjasldkfj HTTP/1.0 diff --git a/configure.in b/configure.in index 3e50b473..f3e0a5ed 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/main.c) -AM_INIT_AUTOMAKE(icecast,2.0) +AM_INIT_AUTOMAKE(icecast,2.0-alpha-1) AC_PROG_CC AC_CANONICAL_HOST @@ -163,4 +163,4 @@ AC_SUBST(DEBUG) AC_SUBST(CFLAGS) AC_SUBST(PROFILE) -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) +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 win32/Makefile win32/res/Makefile) diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 00000000..5f10a45d --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,8 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +EXTRA_DIST = Index.hhk icecast2.chm icecast2.hhc icecast2.hhp index_win32.html \ + stats1.jpg style.css win32_section1.html win32_section2.html \ + win32_section3.html windowtitle.jpg + diff --git a/src/Makefile.am b/src/Makefile.am index 10f94eb9..e7043183 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ bin_PROGRAMS = icecast noinst_HEADERS = config.h os.h logging.h sighandler.h connection.h global.h\ util.h slave.h source.h stats.h refbuf.h client.h format.h format_vorbis.h\ - compat.h format_mp3.h fserve.h + compat.h format_mp3.h fserve.h xslt.h icecast_SOURCES = config.c main.c logging.c sighandler.c connection.c global.c\ util.c slave.c source.c stats.c refbuf.c client.c format.c format_vorbis.c\ format_mp3.c xslt.c fserve.c diff --git a/web/Makefile.am b/web/Makefile.am new file mode 100644 index 00000000..67c637d0 --- /dev/null +++ b/web/Makefile.am @@ -0,0 +1,6 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +EXTRA_DIST = status.xsl status2.xsl + diff --git a/win32/Makefile.am b/win32/Makefile.am new file mode 100644 index 00000000..1cdb0f92 --- /dev/null +++ b/win32/Makefile.am @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +SUBDIRS = res + +EXTRA_DIST = ConfigTab.cpp ConfigTab.h Icecast2win.clw Icecast2win.cpp \ + Icecast2win.dsp Icecast2win.dsw Icecast2win.h Icecast2win.rc \ + Icecast2winDlg.cpp Icecast2winDlg.h Makefile.am ResizableDialog.cpp \ + ResizableDialog.h StatsTab.cpp StatsTab.h Status.cpp Status.h StdAfx.cpp \ + StdAfx.h TabCtrlSSL.cpp TabCtrlSSL.h TabPageSSL.cpp TabPageSSL.h black.bmp \ + colors.h icecast.dsp icecast.ico icecast.xml icecast2.iss icecast2logo2.bmp\ + resource.h running.bmp status.xsl status2.xsl stopped.bmp + diff --git a/win32/res/Makefile.am b/win32/res/Makefile.am new file mode 100644 index 00000000..c65cf606 --- /dev/null +++ b/win32/res/Makefile.am @@ -0,0 +1,6 @@ +## Process this file with automake to produce Makefile.in + +AUTOMAKE_OPTIONS = foreign + +EXTRA_DIST = Icecast2win.rc2 +