Contrib. Try to be a little consistent. This may kill your pinguin.

diff --git a/extras/contrib/src/Distributions/beos.mak b/extras/contrib/src/Distributions/beos.mak
index df746e1e5f7b4e437032dcdbc151389abbccac79..53d9bcffbc7c6b59894ed93cadcf083353585082 100644 (file)
--- a/extras/contrib/src/Distributions/beos.mak
+++ b/extras/contrib/src/Distributions/beos.mak
@@ -4,7 +4,7 @@ ifeq ($(HOST),$(BUILD))
 all: .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 .libdca .aclocal
+       .dvdnav .dvbpsi .dca .aclocal
    #.speex seems
 else
 # Cross compiling: we already have the Linux tools, only build the
@@ -12,6 +12,6 @@ else
 all: .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .flac .faad .faac .lame .twolame .ebml .matroska .ffmpeg .dvdcss \
-       .dvdnav .dvbpsi .libdca .aclocal
+       .dvdnav .dvbpsi .dca .aclocal
 endif
 #.speex

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index 75274325c03b27c77474fdb3c4e7ee74efad5d66..17479557224cdc8bf936f2d1e5d382d88fb08a9a 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -5,8 +5,8 @@ all: .autoconf .automake .libtool .intl .pkgcfg .freetype .fribidi \
     .dvdcss .dvdnav .dvdread .dvbpsi .live .caca .mod \
     .png .gpg-error .gcrypt .gnutls .opendaap .cddb .cdio .vcdimager \
     .SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
-    .libdca .tag .x264 .goom2k4 .aclocal
+    .dca .tag .x264 .goom2k4 .aclocal
 # .expat .clinkcc don't work with SDK yet
-# .glib .libidl .gecko are required to build the mozilla plugin
+# .glib .idl .gecko are required to build the mozilla plugin
 # .mozilla will build an entire mozilla. it can be used if we need to create a new .gecko package
 

diff --git a/extras/contrib/src/Distributions/debian.mak b/extras/contrib/src/Distributions/debian.mak
index 171533072e6d0404e520cf626a03cc092caf4072..a011976ce9dd46a99be4cac88873f2a40b7d145d 100644 (file)
--- a/extras/contrib/src/Distributions/debian.mak
+++ b/extras/contrib/src/Distributions/debian.mak
@@ -5,7 +5,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
        .dvdnav .dvbpsi .wxwidgets .dirac \
-       .libdca .libraw1394 .libdc1394 \
+       .dca .raw1394 .dc1394 \
        .aclocal 
 #      .SDL_image  .daap .cddb .cdio .vcdimager
 

diff --git a/extras/contrib/src/Distributions/fedora.mak b/extras/contrib/src/Distributions/fedora.mak
index 5cade584551497bc7a3023879f0ab4d3636f8e48..ab4f251a6552262b1aa4b6c44c1581fe532c6fd3 100644 (file)
--- a/extras/contrib/src/Distributions/fedora.mak
+++ b/extras/contrib/src/Distributions/fedora.mak
@@ -5,6 +5,6 @@ all: .intl .freetype .fribidi .zlib \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .mpcdec \
        .dvdnav .dvbpsi .wxwidgets .dirac \
-       .libdca .libraw1394 .libdc1394 \
+       .dca .raw1394 .dc1394 \
        .aclocal
 

diff --git a/extras/contrib/src/Distributions/unix.mak b/extras/contrib/src/Distributions/unix.mak
index 2553c41ad4105dbb00f978d2414dd53ebc77366d..558fccc5e42c495ccfbdbd4b38293ec28860f07e 100644 (file)
--- a/extras/contrib/src/Distributions/unix.mak
+++ b/extras/contrib/src/Distributions/unix.mak
@@ -5,7 +5,7 @@ all: .iconv .intl .freetype .fribidi .zlib \
        .live .goom2k4 .caca .mod .x264  .xml .twolame \
        .png .gpg-error .gcrypt .gnutls .mpcdec \
        .dvdnav .dvbpsi .wxwidgets .dirac \
-       .libdca .libraw1394 .libdc1394 \
+       .dca .raw1394 .dc1394 \
        .aclocal
 #      .png .gpg-error .gcrypt .gnutls .mpcdec \
 #      .SDL_image  .daap .cddb .cdio .vcdimager

diff --git a/extras/contrib/src/Distributions/win32.mak b/extras/contrib/src/Distributions/win32.mak
index e805cd59bc73fa7c727225d9f450ecb048bfef6e..ba054b6cb29c26453eacbaea1deb2f39d269e77a 100644 (file)
--- a/extras/contrib/src/Distributions/win32.mak
+++ b/extras/contrib/src/Distributions/win32.mak
@@ -5,6 +5,6 @@ all: .iconv .intl .freetype .fribidi .zlib \
         .live .goom2k4 .caca .mod .x264  .xml .twolame \
         .png .gpg-error .gcrypt .gnutls .mpcdec \
         .dvdnav .dvbpsi .wxwidgets .qt4 .dirac .SDL_image \
-        .dx_headers .dshow_headers .gecko-win32 .unicows .libdca \
+        .dx_headers .dshow_headers .gecko-win32 .unicows .dca \
        .aclocal 
 #       .daap .cddb .cdio .vcdimager .portaudio

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ff1c2e86017f503f4395be2839ad00f7d3e0969d..75fe497b04d55356cd69302bd3edffc42c8c1a45 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1188,11 +1188,11 @@ libdca-$(LIBDCA_VERSION).tar.bz2:
 libdca: libdca-$(LIBDCA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
 
-.libdca: libdca
+.dca: libdca
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
        touch $@
 
-CLEAN_FILE += .libdca
+CLEAN_FILE += .dca
 CLEAN_PKG += libdca
 DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2
 
@@ -1562,12 +1562,12 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
        $(EXTRACT_GZ)
 #endif
 
-.libraw1394: libraw1394
+.raw1394: libraw1394
        (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
 #      sed 's/^typedef u_int8_t  byte_t;/\/* typedef u_int8_t  byte_t;\*\//'
        touch $@
        
-CLEAN_file += .libraw1394
+CLEAN_file += .raw1394
 CLEAN_PKG += libraw1394
 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 
@@ -1593,13 +1593,13 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
        $(EXTRACT_GZ)
 #endif
 
-.libdc1394: libdc1394
+.dc1394: libdc1394
        (cd $<; ./configure --prefix=$(PREFIX) && \
         patch -p1 < ../Patches/libdc1394-noexamples.patch && \
         make && make DESTDIR=$(PRFIX) install)
        touch $@
        
-CLEAN_file += .libdc1394
+CLEAN_file += .dc1394
 CLEAN_PKG += libdc1394
 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz
 
@@ -1729,11 +1729,11 @@ libIDL-$(LIBIDL_VERSION).tar.gz:
 libIDL: libIDL-$(LIBIDL_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.libidl: libIDL
+.idl: libIDL
        (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install )
        touch $@
 
-CLEAN_FILE += .libidl
+CLEAN_FILE += .idl
 CLEAN_PKG += libIDL
 DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz