[vlc-devel] [PATCH v2 08/13] contrib: use consistent names between the package name and the extracted dir
Steve Lhomme
robux4 at ycbcr.xyz
Tue Jul 7 08:29:29 CEST 2020
The original tarball name doesn't matter as we use $(MOVE) in the end.
---
contrib/src/a52/rules.mak | 4 ++--
contrib/src/ass/rules.mak | 4 ++--
contrib/src/dca/rules.mak | 4 ++--
contrib/src/dvbpsi/rules.mak | 4 ++--
contrib/src/fluid/rules.mak | 4 ++--
contrib/src/freetype2/rules.mak | 4 ++--
contrib/src/gme/rules.mak | 4 ++--
contrib/src/gpg-error/rules.mak | 4 ++--
contrib/src/kate/rules.mak | 6 +++---
contrib/src/mad/rules.mak | 6 +++---
contrib/src/modplug/rules.mak | 4 ++--
contrib/src/mpcdec/rules.mak | 4 ++--
contrib/src/ogg/rules.mak | 4 ++--
contrib/src/pthread-stubs/rules.mak | 4 ++--
contrib/src/pthreads/rules.mak | 5 ++++-
contrib/src/shout/rules.mak | 4 ++--
contrib/src/sidplay2/rules.mak | 4 ++--
contrib/src/theora/rules.mak | 4 ++--
contrib/src/tiger/rules.mak | 4 ++--
contrib/src/vorbis/rules.mak | 4 ++--
contrib/src/vpx/rules.mak | 4 ++--
contrib/src/xau/rules.mak | 4 ++--
contrib/src/xcb/rules.mak | 4 ++--
23 files changed, 50 insertions(+), 47 deletions(-)
diff --git a/contrib/src/a52/rules.mak b/contrib/src/a52/rules.mak
index 4e042a17dad..6592c6f53e0 100644
--- a/contrib/src/a52/rules.mak
+++ b/contrib/src/a52/rules.mak
@@ -12,7 +12,7 @@ $(TARBALLS)/a52dec-$(A52DEC_VERSION).tar.gz:
.sum-a52: a52dec-$(A52DEC_VERSION).tar.gz
-a52dec: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
+a52: a52dec-$(A52DEC_VERSION).tar.gz .sum-a52
$(UNPACK)
$(APPLY) $(SRC)/a52/liba52-pic.patch
$(APPLY) $(SRC)/a52/liba52-silence.patch
@@ -22,7 +22,7 @@ ifndef HAVE_FPU
endif
$(MOVE)
-.a52: a52dec
+.a52: a52
$(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
diff --git a/contrib/src/ass/rules.mak b/contrib/src/ass/rules.mak
index 364afbad17c..7726d792676 100644
--- a/contrib/src/ass/rules.mak
+++ b/contrib/src/ass/rules.mak
@@ -40,7 +40,7 @@ $(TARBALLS)/libass-$(ASS_VERSION).tar.gz:
.sum-ass: libass-$(ASS_VERSION).tar.gz
-libass: libass-$(ASS_VERSION).tar.gz .sum-ass
+ass: libass-$(ASS_VERSION).tar.gz .sum-ass
$(UNPACK)
$(APPLY) $(SRC)/ass/ass-macosx.patch
$(APPLY) $(SRC)/ass/coretext-errorhandling.patch
@@ -82,7 +82,7 @@ else
ASS_CFLAGS += -g
endif
-.ass: libass
+.ass: ass
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) $(ASS_CFLAGS)" ./configure $(HOSTCONF) $(ASS_CONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/dca/rules.mak b/contrib/src/dca/rules.mak
index e43a700ef24..d8fbf137bbb 100644
--- a/contrib/src/dca/rules.mak
+++ b/contrib/src/dca/rules.mak
@@ -17,13 +17,13 @@ $(TARBALLS)/libdca-$(DCA_VERSION).tar.bz2:
.sum-dca: libdca-$(DCA_VERSION).tar.bz2
-libdca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
+dca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
$(UNPACK)
$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
$(call pkg_static,"./libdca/libdca.pc.in")
$(MOVE)
-.dca: libdca
+.dca: dca
$(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -std=gnu89" ./configure $(HOSTCONF)
diff --git a/contrib/src/dvbpsi/rules.mak b/contrib/src/dvbpsi/rules.mak
index 045acd044a4..6eef3e1afa1 100644
--- a/contrib/src/dvbpsi/rules.mak
+++ b/contrib/src/dvbpsi/rules.mak
@@ -13,7 +13,7 @@ $(TARBALLS)/libdvbpsi-$(DVBPSI_VERSION).tar.bz2:
.sum-dvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2
-libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
+dvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(UNPACK)
$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub .auto
$(APPLY) $(SRC)/dvbpsi/dvbpsi-noexamples.patch
@@ -23,7 +23,7 @@ libdvbpsi: libdvbpsi-$(DVBPSI_VERSION).tar.bz2 .sum-dvbpsi
$(APPLY) $(SRC)/dvbpsi/0001-really-set-last-section-number.patch
$(MOVE)
-.dvbpsi: libdvbpsi
+.dvbpsi: dvbpsi
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak
index f232be417da..4afcf5c8031 100644
--- a/contrib/src/fluid/rules.mak
+++ b/contrib/src/fluid/rules.mak
@@ -17,7 +17,7 @@ $(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2:
.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2
-fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
+fluid: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
$(UNPACK)
$(APPLY) $(SRC)/fluid/fluid-no-bin.patch
$(APPLY) $(SRC)/fluid/fluid-pkg-static.patch
@@ -45,7 +45,7 @@ FLUIDCONF := $(HOSTCONF) \
--disable-pulse-support \
--without-readline
-.fluid: fluidsynth
+.fluid: fluid
$(RECONF)
cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" ./configure $(FLUIDCONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/freetype2/rules.mak b/contrib/src/freetype2/rules.mak
index eb398c4e086..0fc2c77a16f 100644
--- a/contrib/src/freetype2/rules.mak
+++ b/contrib/src/freetype2/rules.mak
@@ -13,14 +13,14 @@ $(TARBALLS)/freetype-$(FREETYPE2_VERSION).tar.xz:
.sum-freetype2: freetype-$(FREETYPE2_VERSION).tar.xz
-freetype: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
+freetype2: freetype-$(FREETYPE2_VERSION).tar.xz .sum-freetype2
$(UNPACK)
$(call pkg_static, "builds/unix/freetype2.in")
$(MOVE)
DEPS_freetype2 = zlib $(DEPS_zlib)
-.freetype2: freetype
+.freetype2: freetype2
ifndef AD_CLAUSES
$(REQUIRE_GPL)
endif
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index 60af152940a..4bab10c0550 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -10,14 +10,14 @@ $(TARBALLS)/game-music-emu-$(GME_VERSION).tar.bz2:
.sum-gme: game-music-emu-$(GME_VERSION).tar.bz2
-game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
+gme: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
$(UNPACK)
$(APPLY) $(SRC)/gme/gme-quotes.patch
$(APPLY) $(SRC)/gme/skip-underrun.patch
$(APPLY) $(SRC)/gme/gme-static.patch
$(MOVE)
-.gme: game-music-emu toolchain.cmake
+.gme: gme toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) .
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/gpg-error/rules.mak b/contrib/src/gpg-error/rules.mak
index a22c7786324..5ffad6816cb 100644
--- a/contrib/src/gpg-error/rules.mak
+++ b/contrib/src/gpg-error/rules.mak
@@ -11,7 +11,7 @@ endif
.sum-gpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
-libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
+gpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2 .sum-gpg-error
$(UNPACK)
ifdef HAVE_WIN32
$(APPLY) $(SRC)/gpg-error/windres-make.patch
@@ -50,7 +50,7 @@ GPGERROR_CONF := $(HOSTCONF) \
--disable-languages \
--disable-tests
-.gpg-error: libgpg-error
+.gpg-error: gpg-error
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(GPGERROR_CONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/kate/rules.mak b/contrib/src/kate/rules.mak
index 150972d2785..4c1ecb59253 100644
--- a/contrib/src/kate/rules.mak
+++ b/contrib/src/kate/rules.mak
@@ -13,15 +13,15 @@ $(TARBALLS)/libkate-$(KATE_VERSION).tar.gz:
.sum-kate: libkate-$(KATE_VERSION).tar.gz
-libkate: libkate-$(KATE_VERSION).tar.gz .sum-kate
+kate: libkate-$(KATE_VERSION).tar.gz .sum-kate
$(UNPACK)
$(UPDATE_AUTOCONFIG)
$(MOVE)
- mv libkate/config.sub libkate/config.guess libkate/misc/autotools
+ mv kate/config.sub kate/config.guess kate/misc/autotools
DEPS_kate = ogg $(DEPS_ogg)
-.kate: libkate
+.kate: kate
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) \
--disable-valgrind \
--disable-doc
diff --git a/contrib/src/mad/rules.mak b/contrib/src/mad/rules.mak
index 2ac71ee7199..4ab23ec2f24 100644
--- a/contrib/src/mad/rules.mak
+++ b/contrib/src/mad/rules.mak
@@ -26,10 +26,10 @@ endif
.sum-mad: libmad-$(MAD_VERSION).tar.gz
-libmad: libmad-$(MAD_VERSION).tar.gz .sum-mad
+mad: libmad-$(MAD_VERSION).tar.gz .sum-mad
$(UNPACK)
ifdef HAVE_DARWIN_OS
- cd $@-$(MAD_VERSION) && sed \
+ cd libmad-$(MAD_VERSION) && sed \
-e 's%-march=i486%$(EXTRA_CFLAGS) $(EXTRA_LDFLAGS)%' \
-e 's%-dynamiclib%-dynamiclib -arch $(ARCH)%' \
-i.orig configure
@@ -45,7 +45,7 @@ endif
cd $(UNPACK_DIR) && rm -rf aclocal.m4 Makefile.in
$(MOVE)
-.mad: libmad
+.mad: mad
$(REQUIRE_GPL)
$(RECONF)
cd $< && $(HOSTVARS) $(LIBMAD_VARS) ./configure $(HOSTCONF) $(MAD_CONF)
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index aa10fc41bba..94d17e451af 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -13,7 +13,7 @@ $(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
.sum-modplug: libmodplug-$(MODPLUG_VERSION).tar.gz
-libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
+modplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(UNPACK)
$(APPLY) $(SRC)/modplug/modplug-win32-static.patch
$(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch
@@ -24,7 +24,7 @@ endif
$(call pkg_static,"libmodplug.pc.in")
$(MOVE)
-.modplug: libmodplug
+.modplug: modplug
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/mpcdec/rules.mak b/contrib/src/mpcdec/rules.mak
index 9284ad4e99e..789eddee42f 100644
--- a/contrib/src/mpcdec/rules.mak
+++ b/contrib/src/mpcdec/rules.mak
@@ -24,7 +24,7 @@ $(TARBALLS)/musepack_src_r$(MUSE_REV).tar.gz:
# $(warning $@ not implemented)
# touch $@
-musepack: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
+mpcdec: musepack_src_r$(MUSE_REV).tar.gz .sum-mpcdec
$(UNPACK)
$(APPLY) $(SRC)/mpcdec/musepack-no-cflags-clobber.patch
$(APPLY) $(SRC)/mpcdec/musepack-no-binaries.patch
@@ -41,7 +41,7 @@ ifdef HAVE_MACOSX
endif
$(MOVE)
-.mpcdec: musepack toolchain.cmake
+.mpcdec: mpcdec toolchain.cmake
cd $< && $(HOSTVARS_PIC) $(CMAKE) -DSHARED=OFF .
cd $< && $(MAKE) install
mkdir -p -- "$(PREFIX)/lib"
diff --git a/contrib/src/ogg/rules.mak b/contrib/src/ogg/rules.mak
index ef03a645b96..9e81de244d1 100644
--- a/contrib/src/ogg/rules.mak
+++ b/contrib/src/ogg/rules.mak
@@ -15,7 +15,7 @@ $(TARBALLS)/libogg-$(OGG_VERSION).tar.xz:
.sum-ogg: libogg-$(OGG_VERSION).tar.xz
-libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
+ogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UNPACK)
$(APPLY) $(SRC)/ogg/libogg-configure.patch
$(APPLY) $(SRC)/ogg/libogg-disable-check.patch
@@ -23,7 +23,7 @@ libogg: libogg-$(OGG_VERSION).tar.xz .sum-ogg
$(UPDATE_AUTOCONFIG)
$(MOVE)
-.ogg: libogg
+.ogg: ogg
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/pthread-stubs/rules.mak b/contrib/src/pthread-stubs/rules.mak
index be91f3950f3..bb7e739da19 100644
--- a/contrib/src/pthread-stubs/rules.mak
+++ b/contrib/src/pthread-stubs/rules.mak
@@ -6,12 +6,12 @@ $(TARBALLS)/libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2:
.sum-pthread-stubs: libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2
-libpthread-stubs: libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 .sum-pthread-stubs
+pthread-stubs: libpthread-stubs-$(PTHREAD_STUBS_VERSION).tar.bz2 .sum-pthread-stubs
$(UNPACK)
$(call pkg_static,"pthread-stubs.pc.in")
$(MOVE)
-.pthread-stubs: libpthread-stubs
+.pthread-stubs: pthread-stubs
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/pthreads/rules.mak b/contrib/src/pthreads/rules.mak
index c73a5cfd585..d0b8d3834a7 100644
--- a/contrib/src/pthreads/rules.mak
+++ b/contrib/src/pthreads/rules.mak
@@ -40,7 +40,10 @@ pthreads: mingw-w64-$(WINPTHREADS_HASH).tar.xz .sum-pthreads
.sum-winrt_headers: .sum-pthreads
touch $@
-.winrt_headers: pthreads
+winrt_headers: pthreads
+ touch $@
+
+.winrt_headers: winrt_headers
mkdir -p -- "$(PREFIX)/include"
cd $< && cp mingw-w64-headers/include/windows.storage.h "$(PREFIX)/include"
touch $@
diff --git a/contrib/src/shout/rules.mak b/contrib/src/shout/rules.mak
index 76d73c5b42d..70d68eb0747 100644
--- a/contrib/src/shout/rules.mak
+++ b/contrib/src/shout/rules.mak
@@ -18,7 +18,7 @@ $(TARBALLS)/libshout-$(SHOUT_VERSION).tar.gz:
.sum-shout: libshout-$(SHOUT_VERSION).tar.gz
# TODO: fix socket stuff on POSIX and Linux
-libshout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
+shout: libshout-$(SHOUT_VERSION).tar.gz .sum-shout
$(UNPACK)
$(APPLY) $(SRC)/shout/libshout-arpa.patch
$(APPLY) $(SRC)/shout/fix-xiph_openssl.patch
@@ -44,7 +44,7 @@ ifdef HAVE_ANDROID
SHOUT_CONF += "--disable-thread"
endif
-.shout: libshout
+.shout: shout
$(RECONF)
cd $< && $(HOSTVARS) ./configure --without-openssl $(SHOUT_CONF) $(HOSTCONF)
cd $< && $(MAKE) install
diff --git a/contrib/src/sidplay2/rules.mak b/contrib/src/sidplay2/rules.mak
index 0a303363db5..53aeb2fd055 100644
--- a/contrib/src/sidplay2/rules.mak
+++ b/contrib/src/sidplay2/rules.mak
@@ -16,7 +16,7 @@ $(TARBALLS)/sidplay-libs-$(SID_VERSION).tar.gz:
.sum-sidplay2: sidplay-libs-$(SID_VERSION).tar.gz
-sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
+sidplay2: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
$(UNPACK)
$(APPLY) $(SRC)/sidplay2/sidplay2-openmode.patch
$(APPLY) $(SRC)/sidplay2/sidplay2-endian.patch
@@ -29,7 +29,7 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2
$(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch
$(MOVE)
-.sidplay2: sidplay-libs
+.sidplay2: sidplay2
$(REQUIRE_GPL)
for d in . libsidplay builders resid builders/resid-builder \
builders/hardsid-builder libsidutils ; \
diff --git a/contrib/src/theora/rules.mak b/contrib/src/theora/rules.mak
index 612c73ce0da..77f325246ba 100644
--- a/contrib/src/theora/rules.mak
+++ b/contrib/src/theora/rules.mak
@@ -13,7 +13,7 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
.sum-theora: libtheora-$(THEORA_VERSION).tar.xz
-libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
+theora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
$(UNPACK)
$(APPLY) $(SRC)/theora/libtheora-compiler-differentiation.patch
$(APPLY) $(SRC)/theora/libtheora-no-forceaddr.patch
@@ -50,7 +50,7 @@ endif
DEPS_theora = ogg $(DEPS_ogg)
-.theora: libtheora
+.theora: theora
cd $< && $(HOSTVARS) ./configure $(THEORACONF)
cd $< && $(MAKE) install
touch $@
diff --git a/contrib/src/tiger/rules.mak b/contrib/src/tiger/rules.mak
index e4ef1b37b07..53f0baaf762 100644
--- a/contrib/src/tiger/rules.mak
+++ b/contrib/src/tiger/rules.mak
@@ -16,7 +16,7 @@ $(TARBALLS)/libtiger-$(TIGER_VERSION).tar.gz:
.sum-tiger: libtiger-$(TIGER_VERSION).tar.gz
-libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
+tiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
$(UNPACK)
$(APPLY) $(SRC)/tiger/autotools.patch
$(call pkg_static,"misc/pkgconfig/tiger.pc.in")
@@ -24,7 +24,7 @@ libtiger: libtiger-$(TIGER_VERSION).tar.gz .sum-tiger
DEPS_tiger = kate $(DEPS_kate)
-.tiger: libtiger
+.tiger: tiger
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-doc
cd $< && $(MAKE) install
diff --git a/contrib/src/vorbis/rules.mak b/contrib/src/vorbis/rules.mak
index 82bf13a8bc3..0990125f1d1 100644
--- a/contrib/src/vorbis/rules.mak
+++ b/contrib/src/vorbis/rules.mak
@@ -22,7 +22,7 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
.sum-vorbis: libvorbis-$(VORBIS_VERSION).tar.xz
-libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
+vorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
ifdef HAVE_CLANG
$(APPLY) $(SRC)/vorbis/clang.patch
@@ -34,7 +34,7 @@ endif
DEPS_vorbis = ogg $(DEPS_ogg)
-.vorbis: libvorbis
+.vorbis: vorbis
$(RECONF) -Im4
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-docs --disable-examples --disable-oggtest
cd $< && $(MAKE) install
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 83b6503ff56..e17692a12c8 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -13,7 +13,7 @@ $(TARBALLS)/libvpx-$(VPX_VERSION).tar.gz:
.sum-vpx: libvpx-$(VPX_VERSION).tar.gz
-libvpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
+vpx: libvpx-$(VPX_VERSION).tar.gz .sum-vpx
$(UNPACK)
$(APPLY) $(SRC)/vpx/libvpx-ios.patch
ifdef HAVE_ANDROID
@@ -165,7 +165,7 @@ VPX_HOSTVARS = $(HOSTVARS)
endif
endif
-.vpx: libvpx
+.vpx: vpx
rm -rf $(PREFIX)/include/vpx
cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) ./configure --target=$(VPX_TARGET) \
$(VPX_CONF) --prefix=$(PREFIX)
diff --git a/contrib/src/xau/rules.mak b/contrib/src/xau/rules.mak
index d2b2872629f..fe51ecbab1e 100644
--- a/contrib/src/xau/rules.mak
+++ b/contrib/src/xau/rules.mak
@@ -11,13 +11,13 @@ endif
.sum-xau: libXau-$(XAU_VERSION).tar.bz2
-libxau: libXau-$(XAU_VERSION).tar.bz2 .sum-xau
+xau: libXau-$(XAU_VERSION).tar.bz2 .sum-xau
$(UNPACK)
$(MOVE)
DEPS_xau = xorg-macros $(DEPS_xorg-macros) xproto $(DEPS_xproto)
-.xau: libxau
+.xau: xau
$(RECONF)
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-xthreads
cd $< && $(MAKE) install
diff --git a/contrib/src/xcb/rules.mak b/contrib/src/xcb/rules.mak
index 9667eb61f87..727ab5fb01b 100644
--- a/contrib/src/xcb/rules.mak
+++ b/contrib/src/xcb/rules.mak
@@ -19,7 +19,7 @@ $(TARBALLS)/libxcb-$(XCB_VERSION).tar.bz2:
.sum-xcb: libxcb-$(XCB_VERSION).tar.bz2
-libxcb: libxcb-$(XCB_VERSION).tar.bz2 .sum-xcb
+xcb: libxcb-$(XCB_VERSION).tar.bz2 .sum-xcb
$(UNPACK)
$(call pkg_static,"xcb.pc.in")
$(MOVE)
@@ -52,7 +52,7 @@ XCBCONF := \
DEPS_xcb = pthread-stubs xau $(DEPS_xau) xcb-proto $(DEPS_xcb-proto)
-.xcb: libxcb
+.xcb: xcb
cd $< && $(HOSTVARS) ./configure $(XCBCONF)
cd $< && $(MAKE) install
touch $@
--
2.26.2
More information about the vlc-devel
mailing list