Commit 655212dd authored by Sam Hocevar's avatar Sam Hocevar

* Makefile.am:

    + Call $(srcdir)/toolbox from $(builddir) instead of $(srcdir).
    + Call $(builddir)/vlc-config instead of $(srcdir)/vlc-config, because
      generated files end in $(builddir).
    + Added -Imozilla to the mozilla plugin link flags.
    + Look for mozilla/vlcintf.idl in $(srcdir).
  * configure.ac:
    + Set VLC_CONFIG to $(builddir)/vlc-config instead of $(srcdir)/vlc-config.
  * toolbox:
    + Look for Makefile.am in ${srcdir}, and Makefile in ${builddir}.
    + Prepend ${srcdir} to header files we handle.
  * m4/vlc.m4:
    + Look for vlc-config.in.in in ${srcdir} but generate vlc-config.in in
      ${builddir}.
  * modules/gui/skins/src/dialogs.cpp, modules/gui/wxwindows/interface.cpp:
    + Include the pixmap with a path relative to the current directory.

   This commit should fix builds that use --srcdir (Closes: #319).
parent 7cd00a56
......@@ -110,13 +110,13 @@ HEADERS_include_built = \
$(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
cd $(srcdir) && $(srcdir)/toolbox --update-includes
$(srcdir)/toolbox --update-includes
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
cd $(srcdir) && $(srcdir)/toolbox --update-includes
$(srcdir)/toolbox --update-includes
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
cd $(srcdir) && $(srcdir)/toolbox --update-includes
$(srcdir)/toolbox --update-includes
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
......@@ -373,10 +373,10 @@ endif
# Install the modules and the symlinks
install-exec-local:
for i in "" `$(srcdir)/vlc-config --target plugin` ; do if test -n "$$i" ; then \
for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
$(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
fi ; done
for i in "" `$(srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config --target builtin pic` ; do if test -n "$$i" ; then \
for i in "" `$(VLC_CONFIG) --target builtin` `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
$(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
fi ; done
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
......@@ -395,7 +395,7 @@ VLC.app: vlc plugins
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
$(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
"$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done
......@@ -461,7 +461,7 @@ package-win32:
unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
mkdir -p "$(srcdir)/tmp/plugins"
for i in "" `$(srcdir)/vlc-config --target plugin` ; do \
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
$(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
fi ; done
......@@ -603,9 +603,9 @@ endif
mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
$(CPPFLAGS_mozilla_EXTRA)
$(CPPFLAGS_mozilla_EXTRA) -Imozilla
mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
$(CPPFLAGS_mozilla_EXTRA)
$(CPPFLAGS_mozilla_EXTRA) -Imozilla
mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic
BUILT_SOURCES_mozilla = mozilla/vlcintf.h
......@@ -623,11 +623,11 @@ mozilla_vlcintf_xpt_DATA = mozilla/vlcintf.xpt
mozilla_vlcintf_xptdir = $(libdir)/mozilla/components
mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m typelib \
-o mozilla/vlcintf mozilla/vlcintf.idl
-o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
$(XPIDL) -I/usr/share/idl/mozilla -m header \
-o mozilla/vlcintf mozilla/vlcintf.idl
-o mozilla/vlcintf $(srcdir)/mozilla/vlcintf.idl
if HAVE_WIN32
DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA)
......
......@@ -3107,7 +3107,7 @@ AC_SUBST(PLUGIN_PATH)
dnl
dnl Handle substvars that use $(top_srcdir)
dnl
VLC_CONFIG="\$(top_srcdir)/vlc-config"
VLC_CONFIG="\$(top_builddir)/vlc-config"
AC_SUBST(VLC_CONFIG)
CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"
......
vlc (0.6.0+cvs-20030627-2) unstable; urgency=low
* extras/ffmpeg:
+ Fixed compilation for Alpha.
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sat, 21 Jun 2003 17:55:07 +0200
vlc (0.6.0+cvs-20030627-1) unstable; urgency=low
* New upstream release.
......
......@@ -29,36 +29,36 @@ AC_DEFUN([AX_RESTORE_FLAGS], [
dnl Special cases: vlc, pics, plugins, save
AC_DEFUN([AX_ADD_CPPFLAGS], [
for element in [$1]; do
eval "CPPFLAGS_$element="'"$'"{CPPFLAGS_$element} $2"'"'
am_plugins_with_cppflags="${am_plugins_with_cppflags} $element"
eval "CPPFLAGS_${element}="'"$'"{CPPFLAGS_${element}} $2"'"'
am_plugins_with_cppflags="${am_plugins_with_cppflags} ${element}"
done
])
AC_DEFUN([AX_ADD_CFLAGS], [
for element in [$1]; do
eval "CFLAGS_$element="'"$'"{CFLAGS_$element} $2"'"'
am_plugins_with_cflags="${am_plugins_with_cflags} $element"
eval "CFLAGS_${element}="'"$'"{CFLAGS_${element}} $2"'"'
am_plugins_with_cflags="${am_plugins_with_cflags} ${element}"
done
])
AC_DEFUN([AX_ADD_CXXFLAGS], [
for element in [$1]; do
eval "CXXFLAGS_$element="'"$'"{CXXFLAGS_$element} $2"'"'
am_plugins_with_cxxflags="${am_plugins_with_cxxflags} $element"
eval "CXXFLAGS_${element}="'"$'"{CXXFLAGS_${element}} $2"'"'
am_plugins_with_cxxflags="${am_plugins_with_cxxflags} ${element}"
done
])
AC_DEFUN([AX_ADD_OBJCFLAGS], [
for element in [$1]; do
eval "OBJCFLAGS_$element="'"$'"{OBJCFLAGS_$element} $2"'"'
am_plugins_with_objcflags="${am_plugins_with_objcflags} $element"
eval "OBJCFLAGS_${element}="'"$'"{OBJCFLAGS_${element}} $2"'"'
am_plugins_with_objcflags="${am_plugins_with_objcflags} ${element}"
done
])
AC_DEFUN([AX_ADD_LDFLAGS], [
for element in [$1]; do
eval "LDFLAGS_$element="'"$'"{LDFLAGS_$element} $2"'"'
am_plugins_with_ldflags="${am_plugins_with_ldflags} $element"
eval "LDFLAGS_${element}="'"$'"{LDFLAGS_${element}} $2"'"'
am_plugins_with_ldflags="${am_plugins_with_ldflags} ${element}"
done
])
......@@ -67,7 +67,7 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
AC_MSG_RESULT(configure: creating ./vlc-config.in)
rm -f vlc-config.in
sed -ne '/#@1@#/q;p' < vlc-config.in.in \
sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
| sed -e "s/@gprof@/${enable_gprof}/" \
-e "s/@cprof@/${enable_cprof}/" \
-e "s/@optim@/${enable_optimizations}/" \
......@@ -110,11 +110,13 @@ AC_DEFUN([AX_OUTPUT_VLC_CONFIG_IN], [
] done
dnl '/#@1@#/,/#@2@#/{/#@.@#/d;p}' won't work on OS X
sed -ne '/#@1@#/,/#@2@#/p' < vlc-config.in.in | sed -e '/#@.@#/d' >> vlc-config.in
sed -ne '/#@1@#/,/#@2@#/p' < "${srcdir}/vlc-config.in.in" \
| sed -e '/#@.@#/d' >> vlc-config.in
AX_VLC_CONFIG_HELPER
dnl '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
sed -ne '/#@2@#/,$p' < vlc-config.in.in | sed -e '/#@.@#/d' >> vlc-config.in
sed -ne '/#@2@#/,$p' < "${srcdir}/vlc-config.in.in" \
| sed -e '/#@.@#/d' >> vlc-config.in
])
......@@ -2,7 +2,7 @@
* dialogs.cpp: Handles all the different dialog boxes we provide.
*****************************************************************************
* Copyright (C) 2003 VideoLAN
* $Id: dialogs.cpp,v 1.7 2003/06/11 10:42:34 gbazin Exp $
* $Id: dialogs.cpp,v 1.8 2003/06/28 13:04:52 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -59,7 +59,7 @@ void Dialogs::ShowPopup(){}
#else // !MODULE_NAME_IS_basic_skins
#include "../../wxwindows/wxwindows.h"
#include "share/vlc32x32.xpm" // include the graphic icon
#include "../../../../share/vlc32x32.xpm" // include the graphic icon
#define ShowOpen_Event 0
#define ShowOpenSkin_Event 1
......
......@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.41 2003/06/19 12:21:53 gbazin Exp $
* $Id: interface.cpp,v 1.42 2003/06/28 13:04:52 sam Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -68,7 +68,7 @@
#define TOOLBAR_BMP_HEIGHT 36
/* include the icon graphic */
#include "share/vlc32x32.xpm"
#include "../../../share/vlc32x32.xpm"
/*****************************************************************************
* Local class declarations.
......
#! /bin/sh
## toolbox for the VLC media player
## $Id: toolbox,v 1.29 2003/06/28 01:17:47 sam Exp $
## $Id: toolbox,v 1.30 2003/06/28 13:04:52 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -37,9 +37,10 @@ EOF
##
getfiles()
{
awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | \
awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < "${srcdir}/Makefile.am" | \
tr '\\ ' '\n\n' | \
sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'
sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' | \
sed -e "s,^,${srcdir}/,"
}
###
......@@ -115,6 +116,8 @@ if test "${action}" = "vc"
then
echo "generating Visual Studio files..."
srcdir="`sed -ne 's/^srcdir *= *//p;T;q' < Makefile`"
# The evil ^M
M="`printf '\r'`"
......@@ -364,10 +367,11 @@ if test "${action}" = "includes"
then
#set -x
srcdir="`sed -ne 's/^srcdir *= *//p;T;q' < Makefile`"
LIBVLC_HEADERS=`getfiles HEADERS_include`
BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
file=include/vlc_symbols.h
file="${srcdir}/include/vlc_symbols.h"
rm -f ${file}.in
echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
......@@ -385,7 +389,7 @@ then
mv -f ${file}.in ${file}
fi
file=src/misc/modules_plugin.h
file="${srcdir}/src/misc/modules_plugin.h"
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${file}.in > ${file}.tmp
......@@ -400,7 +404,7 @@ then
mv -f ${file}.tmp ${file}
fi
file=src/misc/modules_builtin.h
file="${srcdir}/src/misc/modules_builtin.h"
rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
if test "${BUILTINS}" != ""
......
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