[xiph-commits] r10488 - in trunk/vorbis: . win32

[giles at svn.xiph.org]

Author: giles
Date: 2005-11-27 20:52:57 -0800 (Sun, 27 Nov 2005)
New Revision: 10488

Removed:
   trunk/vorbis/win32/Makefile.am
Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/configure.in
Log:
Remove win32/Makefile.am in favor of just including the whole subtree, 
as we do for the macos build stuff.


Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2005-11-28 04:46:54 UTC (rev 10487)
+++ trunk/vorbis/Makefile.am	2005-11-28 04:52:57 UTC (rev 10488)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign dist-zip
 
-SUBDIRS = lib include doc examples win32 vq
+SUBDIRS = lib include doc examples vq
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
@@ -15,15 +15,16 @@
 # to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON
 # because of it, breaking make dist.  This works just as well.
 EXTRA_DIST = \
-	todo.txt macos macosx autogen.sh \
+	todo.txt autogen.sh \
 	libvorbis.spec libvorbis.spec.in \
 	vorbis.m4 \
 	vorbis.pc.in vorbisenc.pc.in vorbisfile.pc.in \
 	vorbis-uninstalled.pc.in \
 	vorbisenc-uninstalled.pc.in \
 	vorbisfile-uninstalled.pc.in \
-	debian
+	debian macos macosx win32
 
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-docs
 
 dist-hook:
@@ -31,6 +32,7 @@
 	rm -rf `find $(distdir)/debian -name "Makefile*"`
 	rm -rf `find $(distdir)/macos -name .svn`
 	rm -rf `find $(distdir)/macosx -name .svn`
+	rm -rf `find $(distdir)/win32 -name .svn`
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"

Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2005-11-28 04:46:54 UTC (rev 10487)
+++ trunk/vorbis/configure.in	2005-11-28 04:52:57 UTC (rev 10488)
@@ -235,7 +235,6 @@
 doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
 include/Makefile include/vorbis/Makefile
 examples/Makefile
-win32/Makefile
 vq/Makefile
 libvorbis.spec
 vorbis.pc

Deleted: trunk/vorbis/win32/Makefile.am
===================================================================
--- trunk/vorbis/win32/Makefile.am	2005-11-28 04:46:54 UTC (rev 10487)
+++ trunk/vorbis/win32/Makefile.am	2005-11-28 04:52:57 UTC (rev 10488)
@@ -1,11 +0,0 @@
-## Process this with automake to create Makefile.in
-
-EXTRA_DIST = vorbis.def vorbis_dynamic.dsp vorbis_static.dsp\
-	vorbisfile.def vorbisfile_dynamic.dsp vorbisfile_static.dsp\
-	vorbisenc.def vorbisenc_dynamic.dsp vorbisenc_static.dsp\
-	build_vorbis_dynamic.bat build_vorbis_dynamic_debug.bat\
-	build_vorbis_static.bat build_vorbis_static_debug.bat\
-	build_vorbisenc_dynamic.bat build_vorbisenc_dynamic_debug.bat\
-	build_vorbisenc_static.bat build_vorbisenc_static_debug.bat\
-	build_vorbisfile_dynamic.bat build_vorbisfile_dynamic_debug.bat\
-	build_vorbisfile_static.bat build_vorbisfile_static_debug.bat vorbis.dsw