[xiph-commits] r7471 - icecast/branches/kh/libshout

[j at motherfish-iii.xiph.org]

Author: j
Date: Thu Aug  5 19:10:08 2004
New Revision: 7471

Modified:
icecast/branches/kh/libshout/Makefile.am
icecast/branches/kh/libshout/configure.in
Log:
Makefile.am cleanup and bring it more inline with trunk

Modified: icecast/branches/kh/libshout/Makefile.am
===================================================================
--- icecast/branches/kh/libshout/Makefile.am	2004-08-03 18:35:52 UTC (rev 7470)
+++ icecast/branches/kh/libshout/Makefile.am	2004-08-03 18:59:13 UTC (rev 7471)
@@ -3,23 +3,30 @@
AUTOMAKE_OPTIONS = 1.6 foreign dist-bzip2
ACLOCAL_AMFLAGS = -I m4

-SUBDIRS = include src examples
+SUBDIRS = include src examples debian

EXTRA_DIST = README COPYING NEWS m4

+DISTCLEANFILES = shout-config.in
+
+docdir = $(datadir)/doc/$(PACKAGE)
+doc_DATA = COPYING README examples/example.c
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = m4/shout.m4
+
if HAVE_PKGCONFIG
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = shout.pc
else
bin_SCRIPTS = shout-config
endif
-DISTCLEANFILES = shout-config.in

-## SCCS stuff (for BitKeeper)
-GET = true
-
debug:
$(MAKE) all CFLAGS="@DEBUG@"

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

Modified: icecast/branches/kh/libshout/configure.in
===================================================================
--- icecast/branches/kh/libshout/configure.in	2004-08-03 18:35:52 UTC (rev 7470)
+++ icecast/branches/kh/libshout/configure.in	2004-08-03 18:59:13 UTC (rev 7471)
@@ -175,6 +175,7 @@
AC_SUBST(SHOUT_LIBDEPS)

AC_OUTPUT([Makefile
+debian/Makefile
include/Makefile
include/shout/Makefile
include/shout/shout.h