Commit 41e7f0ab authored by Felix Paul Kühne's avatar Felix Paul Kühne

* contrib/Makefile: remove the BUILDDIRS on clean-src as well to prevent the...

* contrib/Makefile: remove the BUILDDIRS on clean-src as well to prevent the disposal of outdated stuff and its mixture with newer libraries
* contrib/src/Makefile: touch .aclocal after copying the aclocal files, so this isn't done everytime make runs
parent 26039bc4
......@@ -2,7 +2,7 @@
# Makefile : Build vlc-contrib files
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: Makefile,v 1.5 2003/11/23 14:00:25 massiot Exp $
# $Id$
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
......@@ -47,6 +47,7 @@ bin: contrib-macosx.tar.bz2
ranlib lib/*\.a
clean-src: FORCE
rm -rf $(BUILDDIRS)
$(MAKE) -C src clean-src
clean-bin: FORCE
......@@ -62,7 +63,7 @@ package: FORCE
exit 1 ; \
fi
mkdir tmp
tar cf - bin include lib vlc-lib share/aclocal* share/autoconf* \
tar cf - bin sbin include lib vlc-lib share/aclocal* share/autoconf* \
share/automake* share/gettext* \
| (cd tmp; tar xf -)
./change_prefix.sh tmp $(PREFIX) @@CONTRIB_PREFIX@@
......
# ***************************************************************************
# src/Makefile : Dearchive and compile all files necessary
# ***************************************************************************
# Copyright (C) 2003, 2004 VideoLAN
# Copyright (C) 2003, 2004, 2005 VideoLAN
# $Id$
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
......@@ -924,7 +924,7 @@ libcdio: libcdio-$(CDIO_VERSION).tar.gz
$(EXTRACT_GZ)
.cdio: libcdio
(cd $<; ./configure --prefix=$(PREFIX) --without-libcddb --without-vcdinfo && make && make install)
(cd $<; ./configure --prefix=$(PREFIX) --without-vcdinfo && make && make install)
touch $@
CLEAN_FILE += .cdio
......@@ -1080,12 +1080,13 @@ DISCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
# ***************************************************************************
# Copy aclocal files
# This is neceserry for --missing aclocal to succeed after a
# This is necessary for --missing aclocal to succeed after a
# configure.ac/Makefile.am change in the vlc root dir
# **************************************************************************
.aclocal:
cp -R $(PREFIX)/share/aclocal/* $(PREFIX)/../../m4/
touch $@
# ***************************************************************************
......
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