Commit 8edf4bc6 authored by Ralph Giles's avatar Ralph Giles

Remove win32/Makefile.am in favor of just including the whole subtree,

as we do for the macos build stuff.

svn path=/trunk/vorbis/; revision=10488
parent 00ab6110
......@@ -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,14 +15,15 @@ pkgconfig_DATA = vorbis.pc vorbisenc.pc vorbisfile.pc
# 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
......@@ -31,6 +32,7 @@ dist-hook:
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@"
......
......@@ -235,7 +235,6 @@ lib/books/floor/Makefile
doc/Makefile doc/vorbisfile/Makefile doc/vorbisenc/Makefile
include/Makefile include/vorbis/Makefile
examples/Makefile
win32/Makefile
vq/Makefile
libvorbis.spec
vorbis.pc
......
## 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
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