[xiph-commits] r7469 - in icecast/branches/kh/ices: . conf src

[j at motherfish-iii.xiph.org]

Author: j
Date: Thu Aug  5 19:08:35 2004
New Revision: 7469

Modified:
icecast/branches/kh/ices/Makefile.am
icecast/branches/kh/ices/conf/Makefile.am
icecast/branches/kh/ices/configure.in
icecast/branches/kh/ices/src/Makefile.am
Log:
cleanup some Makefile.am stuff

Modified: icecast/branches/kh/ices/Makefile.am
===================================================================
--- icecast/branches/kh/ices/Makefile.am	2004-08-03 17:30:03 UTC (rev 7468)
+++ icecast/branches/kh/ices/Makefile.am	2004-08-03 17:31:54 UTC (rev 7469)
@@ -3,9 +3,9 @@
AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2
ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = src conf
+SUBDIRS = conf debian doc src

-EXTRA_DIST = README AUTHORS COPYING TODO NEWS m4
+EXTRA_DIST = README AUTHORS COPYING TODO NEWS m4 contrib

# SCCS Definitions (for BitKeeper)
GET = true
@@ -15,3 +15,10 @@

profile:
$(MAKE) all CFLAGS="@PROFILE@"
+
+dist-hook:
+	rm -rf `find $(distdir)/contrib -name .svn`
+	rm -rf `find $(distdir)/m4 -name .svn`
+	rm -rf `find $(distdir)/src/net -name .svn`
+	rm -rf `find $(distdir)/src/thread -name .svn`
+	rm -rf `find $(distdir)/src/timing -name .svn`

Modified: icecast/branches/kh/ices/conf/Makefile.am
===================================================================
--- icecast/branches/kh/ices/conf/Makefile.am	2004-08-03 17:30:03 UTC (rev 7468)
+++ icecast/branches/kh/ices/conf/Makefile.am	2004-08-03 17:31:54 UTC (rev 7469)
@@ -2,5 +2,4 @@

AUTOMAKE_OPTIONS = foreign

-EXTRA_DIST = ices-live.xml ices-playlist.xml ices-pcm.xml ices-pcm2.xml ices-switch.xml ices-fixit.xml
-
+EXTRA_DIST = ices-fixit.xml ices-jack.xml ices-live.xml ices-pcm2.xml ices-pcm.xml ices-playlist.xml ices-switch.xml

Modified: icecast/branches/kh/ices/configure.in
===================================================================
--- icecast/branches/kh/ices/configure.in	2004-08-03 17:30:03 UTC (rev 7468)
+++ icecast/branches/kh/ices/configure.in	2004-08-03 17:31:54 UTC (rev 7469)
@@ -184,4 +184,4 @@
AC_SUBST(LIBS)
AC_SUBST(LDFLAGS)

-AC_OUTPUT(Makefile conf/Makefile src/Makefile src/log/Makefile)
+AC_OUTPUT(Makefile conf/Makefile debian/Makefile doc/Makefile src/Makefile src/log/Makefile)

Modified: icecast/branches/kh/ices/src/Makefile.am
===================================================================
--- icecast/branches/kh/ices/src/Makefile.am	2004-08-03 17:30:03 UTC (rev 7468)
+++ icecast/branches/kh/ices/src/Makefile.am	2004-08-03 17:31:54 UTC (rev 7469)
@@ -9,7 +9,7 @@
AM_CPPFLAGS = @XIPH_CPPFLAGS@
CFLAGS= -g -O20

-EXTRA_DIST = thread net timing avl
+EXTRA_DIST = thread net timing
EXTRA_ices_SOURCES = im_oss.c im_sun.c im_alsa.c

if HAVE_OSS_AUDIO