Changeset 655212ddf8a63bbb919e1f05d38117369f88de66

Timestamp:

06/28/03 15:04:52 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1056805492 +0000

git-parent:

[7cd00a5602cebe6a174f5690d41df063da24a206]

git-author:

Sam Hocevar <sam@videolan.org> 1056805492 +0000

Message:

• 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).

Files:

• Makefile.am (modified) (6 diffs)
• configure.ac (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• m4/vlc.m4 (modified) (7 diffs)
• modules/gui/skins/src/dialogs.cpp (modified) (2 diffs)
• modules/gui/wxwindows/interface.cpp (modified) (2 diffs)
• toolbox (modified) (6 diffs)

Makefile.am

@@ -111 +111 @@
-
-include/vlc_symbols.h: Makefile $(HEADERS_include)
-cd $(srcdir) && 
+
-
-src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
-cd $(srcdir) && 
+
-
-src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
-cd $(srcdir) && 
+
-
-# These dependencies are mandatory
@@ -374 +374 @@
-# Install the modules and the symlinks
-install-exec-local:
-srcdir)/vlc-config
+VLC_CONFIG)
-      $(INSTALL) -m 755 "$$i$(LIBEXT)" "$(DESTDIR)$(libdir)/vlc/`echo $$i | cut -f2 -d/`" ; \
-    fi ; done
-srcdir)/vlc-config --target builtin` `$(srcdir)/vlc-config
+VLC_CONFIG) --target builtin` `$(VLC_CONFIG)
-      $(INSTALL) -m 644 "$$i" "$(DESTDIR)$(libdir)/vlc" ; \
-    fi ; done
@@ -396 +396 @@
-    $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
-    $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
-srcdir)/vlc-config
+VLC_CONFIG)
-      if test -n "$$i" ; then $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
-        "$(srcdir)/VLC.app/Contents/MacOS/modules" ; \
@@ -462 +462 @@
-
-    mkdir -p "$(srcdir)/tmp/plugins"
-srcdir)/vlc-config
+VLC_CONFIG)
-      if test -n "$$i" ; then \
-        $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
@@ -604 +604 @@
-mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
-mozilla_libplugin_a_CFLAGS = `$(VLC_CONFIG) --cflags mozilla pic` \
-
+ -Imozilla
-mozilla_libplugin_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags mozilla pic` \
-
+ -Imozilla
-mozilla_libplugin_a_DEPENDENCIES = lib/libvlc_pic.a $(DATA_npvlc_rc) builtins_pic
-
@@ -624 +624 @@
-mozilla/vlcintf.xpt: Makefile mozilla/vlcintf.idl
-    $(XPIDL) -I/usr/share/idl/mozilla -m typelib \
-
+$(srcdir)/
-
-mozilla/vlcintf.h: Makefile mozilla/vlcintf.idl
-    $(XPIDL) -I/usr/share/idl/mozilla -m header \
-
+$(srcdir)/
-
-if HAVE_WIN32

configure.ac

@@ -3108 +3108 @@
-dnl  Handle substvars that use $(top_srcdir)
-dnl
-src
+build
-AC_SUBST(VLC_CONFIG)
-CPPFLAGS_save="${CPPFLAGS_save} -I\$(top_srcdir)/include"

debian/changelog

@@ +1 @@
+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
-

m4/vlc.m4

@@ -30 +30 @@
-AC_DEFUN([AX_ADD_CPPFLAGS], [
-  for element in [$1]; do
-element="'"$'"{CPPFLAGS_$element
-element
+{element}="'"$'"{CPPFLAGS_${element}
+{element}
-  done
-])
@@ -37 +37 @@
-AC_DEFUN([AX_ADD_CFLAGS], [
-  for element in [$1]; do
-element="'"$'"{CFLAGS_$element
-element
+{element}="'"$'"{CFLAGS_${element}
+{element}
-  done
-])
@@ -44 +44 @@
-AC_DEFUN([AX_ADD_CXXFLAGS], [
-  for element in [$1]; do
-element="'"$'"{CXXFLAGS_$element
-element
+{element}="'"$'"{CXXFLAGS_${element}
+{element}
-  done
-])
@@ -51 +51 @@
-AC_DEFUN([AX_ADD_OBJCFLAGS], [
-  for element in [$1]; do
-element="'"$'"{OBJCFLAGS_$element
-element
+{element}="'"$'"{OBJCFLAGS_${element}
+{element}
-  done
-])
@@ -58 +58 @@
-AC_DEFUN([AX_ADD_LDFLAGS], [
-  for element in [$1]; do
-element="'"$'"{LDFLAGS_$element
-element
+{element}="'"$'"{LDFLAGS_${element}
+{element}
-  done
-])
@@ -68 +68 @@
-
-  rm -f vlc-config.in
-vlc-config.in.in
+"${srcdir}/vlc-config.in.in"
-    | sed -e "s/@gprof@/${enable_gprof}/" \
-          -e "s/@cprof@/${enable_cprof}/" \
@@ -111 +111 @@
-
-  dnl  '/#@1@#/,/#@2@#/{/#@.@#/d;p}' won't work on OS X
-
+
+
-
-  AX_VLC_CONFIG_HELPER
-
-  dnl  '/#@2@#/,${/#@.@#/d;p}' won't work on OS X
-
+
+
-])
-

modules/gui/skins/src/dialogs.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2003 VideoLAN
-7 2003/06/11 10:42:34 gbazin
+8 2003/06/28 13:04:52 sam
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -60 +60 @@
-
-#include "../../wxwindows/wxwindows.h"
-
+../../../../
-
-#define ShowOpen_Event     0

modules/gui/wxwindows/interface.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-1 2003/06/19 12:21:53 gbazin
+2 2003/06/28 13:04:52 sam
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -69 +69 @@
-
-/* include the icon graphic */
-
+../../../
-
-/*****************************************************************************

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-29 2003/06/28 01:17:47
+30 2003/06/28 13:04:52
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -38 +38 @@
-getfiles()
-{
-Makefile.am
+"${srcdir}/Makefile.am"
-    tr '\\ ' '\n\n' | \
-
+
+
-}
-
@@ -115 +116 @@
-then
-  echo "generating Visual Studio files..."
+
+  srcdir="`sed -ne 's/^srcdir *= *//p;T;q' < Makefile`"
-
-  #  The evil ^M
@@ -365 +368 @@
-  #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`
-
-include/vlc_symbols.h
+"${srcdir}/include/vlc_symbols.h"
-
-  rm -f ${file}.in
@@ -386 +390 @@
-  fi
-
-src/misc/modules_plugin.h
+"${srcdir}/src/misc/modules_plugin.h"
-
-  rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
@@ -401 +405 @@
-  fi
-
-src/misc/modules_builtin.h
+"${srcdir}/src/misc/modules_builtin.h"
-
-  rm -f ${file}.tmp && cp ${file}.in ${file}.tmp