Modify all: makefile rule to use DISTRO_PKG.

extras/contrib/bootstrap

@@ -208,3 +208,19 @@ elif svn help >/dev/null 2>&1; then
 else
         echo "You do not have a subversion client installed." >&2
 fi
+
+# Test if this system supports RPM packaging system.
+# Try to guess the rpm build binary
+RPMBUILD=
+if test -x /usr/bin/rpmbuild; then
+    RPMBUILD="/usr/bin/rpmbuild"
+elif test -x /usr/sbin/rpmbuild; then
+    RPMBUILD="/usr/sbin/rpmbuild"
+elif test -x /usr/bin/rpm; then
+    RPMBUILD="/usr/bin/rpm"
+elif test -x /usr/sbin/rpm; then
+    RPMBUILD="/usr/sbin/rpm"
+fi
+if test ! -z "$RPMBUILD"; then
+    echo "RPMBUILD = $RPMBUILD" >> config.mak
+fi

extras/contrib/src/Distributions/beos.mak

 # Beos Rules
 ifeq ($(HOST),$(BUILD))
 # Native build: we need perl, autoconf, etc first
-all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
+DISTRO_PKG= .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.dvdnav .dvbpsi .dca .aclocal
@@ -9,7 +9,7 @@ all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
 else
 # Cross compiling: we already have the Linux tools, only build the
 # libraries now
-all: .iconv .intl .freetype .fribidi \
+DISTRO_PKG= .iconv .intl .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
 	.dvdnav .dvbpsi .dca .aclocal

extras/contrib/src/Distributions/darwin.mak

 # Darwin rules
-all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
+DISTRO_PKG= .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
     .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
     .flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
     .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \

extras/contrib/src/Distributions/debian.mak

 # Debian Linux
-all: .iconv .intl .freetype .fribidi .zlib \
+DISTRO_PKG= .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \

extras/contrib/src/Distributions/fedora.mak

 # Fedora Linux rules
-all: \
+DISTRO_PKG= \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \

extras/contrib/src/Distributions/netbox3.mak

 # NetBOX Linux rules
-all: .iconv .intl .freetype .zlib \
+DISTRO_PKG= .iconv .intl .freetype .zlib \
 	.mpeg2 .faad .ffmpeg .live .xml \
 	.dvbpsi
 

extras/contrib/src/Distributions/rhel.mak

-all: .fribidi \
+# RHEL 5
+DISTRO_PKG= .fribidi \
 	.a52 .mpeg2 .id3tag .mad \
 	.faad .faac .lame .ebml .matroska .libamrnb .libamrwb .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264 .xml .twolame \

extras/contrib/src/Distributions/unix.mak

 # Standard Linux or other UNIX-like systems
-all: .iconv .intl .freetype .fribidi .zlib \
+DISTRO_PKG= .iconv .intl .freetype .fribidi .zlib \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \

extras/contrib/src/Distributions/win32.mak

 # WIN32 rules
-all: .iconv .intl .freetype .fribidi .zlib \
+DISTRO_PKG= .iconv .intl .freetype .fribidi .zlib \
         .a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
         .flac .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
         .live .goom2k4 .caca .mod .x264  .xml .twolame \

extras/contrib/src/Distributions/wince.mak

 # WinCE rules
-all: .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
+DISTRO_PKG= .dvbpsi .zlib .ffmpeg .ogg .tremor .faad
 

extras/contrib/src/Makefile

@@ -135,7 +135,9 @@ endif
 # Standard rules
 # ***************************************************************************
 
+DISTRO_PKG=
 include ../distro.mak
+all: $(DISTRO_PKG)
 
 FORCE:
 
@@ -164,6 +166,11 @@ define EXTRACT_ZIP
 	touch $@
 endef
 
+define COMPRESS_TGZ
+	rm -f $@.tar.gz || true
+	tar -cz $@ > $<.tgz || true
+endef
+
 ### Darwin-specific ###
 # These macros prepare the dynamic libraries for inclusion in the Mac OS X
 # bundle. For instance if you're building a library named libtoto.dylib,