[xiph-commits] r3352 - liboggz/trunk

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-01-12 20:41:09 -0800 (Sat, 12 Jan 2008)
New Revision: 3352

Modified:
   liboggz/trunk/Makefile.am
Log:
remove use of wildcards in Makefile.am for compatibility with older automake
(fixes 'make distcheck' with automake 1.8)


Modified: liboggz/trunk/Makefile.am
===================================================================
--- liboggz/trunk/Makefile.am	2008-01-13 03:34:23 UTC (rev 3351)
+++ liboggz/trunk/Makefile.am	2008-01-13 04:41:09 UTC (rev 3352)
@@ -14,18 +14,64 @@
 
 SUBDIRS = doc include src
 
-EXTRA_DIST = oggz.pc.in oggz-uninstalled.pc.in README.symbian README.win32 \
+# pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = oggz.pc
+
+# Extra files to distribute in the source tarball.
+EXTRA_DIST = oggz.pc.in oggz-uninstalled.pc.in \
+	$(SYMBIAN_extra_dist) $(WIN32_extra_dist)
+
+# Extra files to distribute for the Symbian build.
+SYMBIAN_extra_dist = \
+	README.symbian \
 	symbian/bld.inf \
 	symbian/config.h \
-	symbian/liboggz.mmp \
+	symbian/liboggz.mmp
+
+# Extra files to distribute for the Win32 build.
+# Note that with Automake 1.9 it is possible to use wildcards instead of
+# listing out files explicitly, ie.
+#	win32/*.[ch] \
+#	win32/*.def \
+#	win32/*.dsp \
+#	win32/*.dsw \
+#	win32/VS200[35]/*.sln \
+#	win32/VS200[35]/liboggz/*.vcproj \
+# And with earlier versions, it is possible to use $(wildcard ...) if using
+# GNU make.
+# However, we list them out here for the sake of compatibility with earlier
+# versions of Automake, and for portability with other vendors' make.
+WIN32_extra_dist = \
+	README.win32 \
 	win32/Makefile \
-	win32/*.[ch] \
-	win32/*.def \
-	win32/*.dsp \
-	win32/*.dsw \
-	win32/VS200[35]/*.sln \
-	win32/VS200[35]/liboggz/*.vcproj \
+	win32/attgetopt.c \
+	win32/config.h \
+	win32/getopt.h \
+	win32/strsep.c \
+	win32/liboggz.def \
+	win32/liboggz.dsp \
+	win32/oggzdump.dsp \
+	win32/oggzed.dsp \
+	win32/oggzinfo.dsp \
+	win32/oggzmerge.dsp \
+	win32/liboggz.dsw \
+	win32/VS2003/liboggz.sln \
+	win32/VS2005/liboggz.sln \
+	win32/VS2003/liboggz/libogg_importer.vcproj \
+	win32/VS2003/liboggz/liboggz.vcproj \
+	win32/VS2003/liboggz/oggzdump.vcproj \
+	win32/VS2003/liboggz/oggzinfo.vcproj \
+	win32/VS2003/liboggz/oggzmerge.vcproj \
+	win32/VS2003/liboggz/oggzrip.vcproj \
+	win32/VS2003/liboggz/oggzscan.vcproj \
+	win32/VS2003/liboggz/oggzvalidate.vcproj \
+	win32/VS2005/liboggz/libogg_importer.vcproj \
+	win32/VS2005/liboggz/liboggz.vcproj \
+	win32/VS2005/liboggz/oggzdump.vcproj \
+	win32/VS2005/liboggz/oggzinfo.vcproj \
+	win32/VS2005/liboggz/oggzmerge.vcproj \
+	win32/VS2005/liboggz/oggzrip.vcproj \
+	win32/VS2005/liboggz/oggzscan.vcproj \
+	win32/VS2005/liboggz/oggzvalidate.vcproj \
 	win32/liboggz_bin_installer/liboggz_bin_installer.vdproj
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = oggz.pc