Commit f3d741a2 authored by Pierre's avatar Pierre
Browse files

automake: Use CONTRIB_DIR instead of manually assuming contrib location.

parent 4c553411
...@@ -357,9 +357,9 @@ vlc-bundle: vlc ...@@ -357,9 +357,9 @@ vlc-bundle: vlc
cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \ cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
fi ; \ fi ; \
done done
if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \ if test -d $(CONTRIB_DIR)/vlc-lib ; then \
mkdir -p $(top_builddir)/vlc-bundle/lib ; \ mkdir -p $(top_builddir)/vlc-bundle/lib ; \
for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \ for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
cp $$i $(top_builddir)/vlc-bundle/lib/ ; \ cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
done ; \ done ; \
fi fi
...@@ -440,7 +440,7 @@ VLC-release.app: vlc ...@@ -440,7 +440,7 @@ VLC-release.app: vlc
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
...@@ -593,7 +593,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib ...@@ -593,7 +593,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
done done
mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle mkdir -p $(top_builddir)/tmp/extras/contrib/Sparkle
cp -R $(top_srcdir)/extras/contrib/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle cp -R $(CONTRIB_DIR)/Sparkle/Sparkle.framework $(top_builddir)/tmp/extras/contrib/Sparkle
mkdir -p $(top_builddir)/tmp/modules/audio_output mkdir -p $(top_builddir)/tmp/modules/audio_output
mkdir -p $(top_builddir)/tmp/modules/gui/macosx mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \ for i in \
...@@ -765,7 +765,7 @@ package-win32-base-debug: package-win-common ...@@ -765,7 +765,7 @@ package-win32-base-debug: package-win-common
fi ; done fi ; done
# Contrib *.dll's # Contrib *.dll's
# cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true # cp $(CONTRIB_DIR)/lib/*.dll "vlc-$(VERSION)/" || true
#Enable DEP and ASLR for all the binaries #Enable DEP and ASLR for all the binaries
if USE_PEFLAGS if USE_PEFLAGS
......
...@@ -135,6 +135,7 @@ AC_ARG_WITH(contrib, ...@@ -135,6 +135,7 @@ AC_ARG_WITH(contrib,
AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}]) AC_MSG_CHECKING([for libs in ${CONTRIB_DIR}])
AS_IF([test -d ${CONTRIB_DIR}/lib],[ AS_IF([test -d ${CONTRIB_DIR}/lib],[
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_SUBST(CONTRIB_DIR)
export PATH=${CONTRIB_DIR}/bin:$PATH export PATH=${CONTRIB_DIR}/bin:$PATH
CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include" CPPFLAGS="${CPPFLAGS} -I${CONTRIB_DIR}/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include" CPPFLAGS_save="${CPPFLAGS_save} -I${CONTRIB_DIR}/include"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment