[xiph-commits] r10484 - in trunk/ogg: . win32

[giles at svn.xiph.org]

Author: giles
Date: 2005-11-27 20:37:31 -0800 (Sun, 27 Nov 2005)
New Revision: 10484

Removed:
   trunk/ogg/win32/Makefile.am
Modified:
   trunk/ogg/Makefile.am
   trunk/ogg/configure.in
Log:
Remove win32/Makefile.am in favor of just including the whole dir, like 
we do for the MacOS build stuff.

If there was a reason for doing it this way, I don't remember what it 
was. The reason we're switching is that 'make dist' doesn't pull in the 
new VS2003 project files, and this seems better than adding each 
specific file all the time.


Modified: trunk/ogg/Makefile.am
===================================================================
--- trunk/ogg/Makefile.am	2005-11-28 04:28:49 UTC (rev 10483)
+++ trunk/ogg/Makefile.am	2005-11-28 04:37:31 UTC (rev 10484)
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = foreign 1.6 dist-zip
 
-SUBDIRS = src include doc win32
+SUBDIRS = src include doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = ogg.m4
@@ -17,13 +17,14 @@
 EXTRA_DIST = README AUTHORS CHANGES COPYING \
 	libogg.spec libogg.spec.in \
 	ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \
-	macos macosx debian
+	debian macos macosx win32
 
 dist-hook:
 	rm -rf `find $(distdir)/debian -name .svn`
 	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/ogg/configure.in
===================================================================
--- trunk/ogg/configure.in	2005-11-28 04:28:49 UTC (rev 10483)
+++ trunk/ogg/configure.in	2005-11-28 04:37:31 UTC (rev 10484)
@@ -294,7 +294,6 @@
 src/Makefile
 doc/Makefile doc/libogg/Makefile
 include/Makefile include/ogg/Makefile include/ogg/config_types.h
-win32/Makefile
 libogg.spec
 ogg.pc
 ogg-uninstalled.pc

Deleted: trunk/ogg/win32/Makefile.am
===================================================================
--- trunk/ogg/win32/Makefile.am	2005-11-28 04:28:49 UTC (rev 10483)
+++ trunk/ogg/win32/Makefile.am	2005-11-28 04:37:31 UTC (rev 10484)
@@ -1,5 +0,0 @@
-## Process this with automake to create Makefile.in
-
-EXTRA_DIST = ogg.def ogg_dynamic.dsp ogg_static.dsp\
-	build_ogg_dynamic.bat build_ogg_dynamic_debug.bat\
-	build_ogg_static.bat build_ogg_static_debug.bat ogg.dsw