* ./include/vlc_common.h, ./src/extras/libc.c: exported our custom libc

    functions to plugins.
  * ./bootstrap: enhanced the project file generation for plugins; we now
    parse makefiles to make this easier.
  * ./modules/**/Modules.am: reworked a few makefiles so that they are more
    easily parsed.

diff --git a/FAQ b/FAQ
index a314c7753e0501217b7119254f272bc4554031e4..77ebab04b15b7e633bc1b59f9700800d72f3e89f 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -1,5 +1,5 @@
 Frequentely Asked Questions for VideoLAN Client
-$Id: FAQ,v 1.12 2002/10/11 23:44:25 massiot Exp $
+$Id: FAQ,v 1.13 2002/11/20 08:58:20 sam Exp $
 
 1. Using VLC
 
@@ -71,8 +71,8 @@ For binary packages, remove old packages first and install the new ones
 
 1.9 Debian: what should I put in my sources.list for videolan ?
 -------------------------------------------------------------
-deb     ftp://ftp.videolan.org/pub/videolan/debian $(ARCH)/
-deb-src ftp://ftp.videolan.org/pub/videolan/debian sources/
+deb     http://www.videolan.org/pub/videolan/debian $(ARCH)/
+deb-src http://www.videolan.org/pub/videolan/debian sources/
 
 1.10 How can I save my VLC configuration ?
 ----------------------------------------

diff --git a/bootstrap b/bootstrap
index 7af99ad4a3cee900522fa8d19f1f7ab8e74a4f88..f2c2dff2d62f14e10559c9db0babd2f7d739933c 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.29 2002/11/19 17:38:06 sam Exp $
+##  $Id: bootstrap,v 1.30 2002/11/20 08:58:20 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -84,11 +84,13 @@ then
   LIBVLC_HEADERS=`make show-libvlc-headers | grep '^X: ' | cut -b3-`
   LIBVLC_PKG_HEADERS=`make show-libvlc-pkg-headers | grep '^X: ' | cut -b3-`
 
+  # Clean up
+  rm -f evc/*.vcp msvc/*.dsp
+
   # libvlc files
   for target in evc/libvlc.vcp msvc/libvlc.dsp
   do
     echo "${target}"
-    rm -f ${target}
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -195,35 +197,42 @@ EOF
   done
 
   # plugins files
-  for dir in evc msvc
+  grep '^L_[^ ]*_pic =' Modules.am | while read a b c
   do
-    test "${dir}" = "evc" && suf="vcp" || suf="dsp"
-    for plugin in dummy
+    makefile="`echo $c | sed -e 's@/[^/]*$@/Modules.am@'`"
+    plugin="`echo $a | sed 's/L_\(.*\)_pic/\1/'`"
+    # this is an attempt at getting a list of plugin sources... we take the
+    # production and remove everything that does not contain "module", which
+    # means you miss $(NULL), but other variables too.
+    cfiles=`awk 'BEGIN{a=0}{if(!a&&/^SOURCES_'${plugin}'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < ${makefile} | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p'`
+    hfiles=`for i in ${cfiles} ; do echo $i ; done | grep '\.h$'`
+    cfiles=`for i in ${cfiles} ; do echo $i ; done | grep -v '\.h$'`
+    for dir in evc msvc
     do
-      makefile="`grep '^L_'${plugin}'_pic =' Modules.am | sed -e 's@.* modules@modules@' -e 's@/[^/]*$@/Modules.am@'`"
+      test "${dir}" = "evc" && suf="vcp" || suf="dsp"
       source="${dir}/plugins.${suf}.in"
       target="${dir}/plugin_${plugin}.${suf}"
       echo "${target}"
-      rm -f ${target}
       perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${plugin}'/g' < ${source} > ${target}
-      # this is an attempt at getting a list of plugin sources
-      sed -ne 's/^SOURCES_'${plugin}'.*=//; t foo; /^[a-zA-Z]/q; :foo p' < ${makefile} | tr '\\ ' '\n\n' | sed -ne 's,/,\\\\,g; s/.*modules/modules/p' | while read source
+      for cfile in ${cfiles}
       do
         cat >> ${target} << EOF
 # Begin Source File${M}
-SOURCE="..\\${source}"${M}
+SOURCE="..\\${cfile}"${M}
 # End Source File${M}
 EOF
       done
       # sed is really nicer for this... unfortunately it's broken under cygwin
       # sed -ne '1,/§SOURCES§/d; /§HEADERS§/,$d; p' < ${source} >> ${target}
       perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){if(/§HEADERS§/){last;}print $_}' < ${source} >> ${target}
-### header generation disabled
-##      cat >> ${target} << EOF
-### Begin Source File${M}
-##SOURCE="..\\test.h"${M}
-### End Source File${M}
-##EOF
+      for hfile in ${hfiles}
+      do
+        cat >> ${target} << EOF
+# Begin Source File${M}
+SOURCE="..\\${hfile}"${M}
+# End Source File${M}
+EOF
+      done
       # sed -ne '1,/§HEADERS§/d; p' < ${source} >> ${target}
       perl -e 'while(<>){if(/§HEADERS§/){last;}}while(<>){print $_}' < ${source} >> ${target}
     done
@@ -233,7 +242,6 @@ EOF
   for target in evc/vlc.vcp msvc/vlc.dsp
   do
     echo "${target}"
-    rm -f ${target}
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files

diff --git a/evc/plugins.vcp.in b/evc/plugins.vcp.in
index 8162e8aac428809a7b107057a243f965d7064ab6..ae9096b2f02c34a89cff80a3353b2c800d3eae3d 100644 (file)
--- a/evc/plugins.vcp.in
+++ b/evc/plugins.vcp.in
@@ -60,8 +60,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 CPP=clmips.exe\r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "MIPS" /D "_MIPS_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -93,8 +93,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "MIPS" /d "_MIPS_" /r\r
 CPP=clmips.exe\r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -126,8 +126,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 CPP=shcl.exe\r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Qsh4 /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c\r
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Qsh4 /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH4" /D "_SH4_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -159,8 +159,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "SHx" /d "SH4" /d "_SH4_" /r\r
 CPP=shcl.exe\r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Qsh4 /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c\r
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /Qsh4 /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Qsh4 /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -192,8 +192,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 CPP=shcl.exe\r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "SHx" /D "SH3" /D "_SH3_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -225,8 +225,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "SHx" /d "SH3" /d "_SH3_" /r\r
 CPP=shcl.exe\r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -258,8 +258,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 CPP=clarm.exe\r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Oxs /M$(CECrtMT) /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /Oxs /M$(CECrtMT) /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "ARM" /D "_ARM_" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Oxs /M$(CECrtMT) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -291,8 +291,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /r\r
 CPP=clarm.exe\r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /M$(CECrtMTDebug) /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /M$(CECrtMTDebug) /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /M$(CECrtMTDebug) /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -324,8 +324,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 CPP=cl.exe\r
-# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Gz /Oxs /c\r
-# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c\r
+# ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /Gz /Oxs /c\r
+# ADD CPP /nologo /W3 /I "." /I "..\include" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /Oxs /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
@@ -357,8 +357,8 @@ RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "i486" /r\r
 CPP=cl.exe\r
-# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /Yu"stdafx.h" /Gz /c\r
-# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "PLUGIN_DUMMY_EXPORTS" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c\r
+# ADD BASE CPP /nologo /W3 /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "$(CePlatform)" /D "i486" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /Gz /c\r
+# ADD CPP /nologo /W3 /Zi /Od /I "." /I "..\include" /D "DEBUG" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "i486" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "__VLC__" /D "__PLUGIN__" /D MODULE_NAME=§PLUGIN§ /D "MODULE_NAME_is_§PLUGIN§" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" /YX /Gz /c\r
 MTL=midl.exe\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 00e3badf94bbf2a75c4874e9b9f85ddce0432268..ea71aff7fbc789ab81b97b64d32f516f1216c5eb 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -3,7 +3,7 @@
  * Collection of useful common types and macros definitions
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc_common.h,v 1.38 2002/11/13 15:28:24 sam Exp $
+ * $Id: vlc_common.h,v 1.39 2002/11/20 08:58:20 sam Exp $
  *
  * Authors: Samuel Hocevar <sam@via.ecp.fr>
  *          Vincent Seguin <seguin@via.ecp.fr>
@@ -469,39 +469,57 @@ static inline uint64_t U64_AT( void * _p )
 
 #endif
 
-/* strdup/strndup (defined in src/extras/libc.c) */
+/* Stuff defined in src/extras/libc.c */
 #ifndef HAVE_STRDUP
-    char * strdup( const char *s );
+#   define strdup vlc_strdup
+    VLC_EXPORT( char *, vlc_strdup, ( const char *s ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_strdup NULL
 #endif
+
 #ifndef HAVE_STRNDUP
-    char * strndup( const char *s, size_t n );
+#   define strndup vlc_strndup
+    VLC_EXPORT( char *, vlc_strndup, ( const char *s, size_t n ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_strndup NULL
 #endif
 
-/* atof (defined in src/extras/libc.c) */
 #ifndef HAVE_ATOF
-    double atof( const char *nptr );
+#   define atof vlc_atof
+    VLC_EXPORT( double, vlc_atof, ( const char *nptr ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_atof NULL
 #endif
 
-/* getenv - always returns NULL */
 #ifndef HAVE_GETENV
-    char *getenv( const char *name );
+#   define getenv vlc_getenv
+    VLC_EXPORT( char *, vlc_getenv, ( const char *name ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_getenv NULL
 #endif
 
-/* strncasecmp/strcasecmp (defined in src/extras/libc.c) */
 #ifndef HAVE_STRCASECMP
 #   ifdef HAVE_STRICMP
 #       define strcasecmp stricmp
-#   else
-        int strcasecmp( const char *s1, const char *s2 );
+#       define vlc_strcasecmp NULL
+#   elif !defined(__PLUGIN__)
+#       define strcasecmp vlc_strcasecmp
+        VLC_EXPORT( int, vlc_strcasecmp, ( const char *s1, const char *s2 ) );
 #   endif
+#elif !defined(__PLUGIN__)
+#   define vlc_strcasecmp NULL
 #endif
 
 #ifndef HAVE_STRNCASECMP
 #   ifdef HAVE_STRNICMP
 #       define strncasecmp strnicmp
-#   else
-        int strncasecmp( const char *s1, const char *s2, size_t n );
+#       define vlc_strncasecmp NULL
+#   elif !defined(__PLUGIN__)
+#       define strncasecmp vlc_strncasecmp
+        VLC_EXPORT( int, vlc_strncasecmp, ( const char *s1, const char *s2, size_t n ) );
 #   endif
+#elif !defined(__PLUGIN__)
+#   define vlc_strncasecmp NULL
 #endif
 
 /* Format type specifiers for 64 bits numbers */
@@ -581,7 +599,10 @@ typedef __int64 off_t;
 
 /* lseek (defined in src/extras/libc.c) */
 #ifndef HAVE_LSEEK
-    off_t lseek( int fildes, off_t offset, int whence );
+#   define lseek vlc_lseek
+    VLC_EXPORT( off_t, vlc_lseek, ( int fildes, off_t offset, int whence ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_lseek NULL
 #endif
 
 /*****************************************************************************

diff --git a/modules/access/dvd/Modules.am b/modules/access/dvd/Modules.am
index 426c66a07081fc383074fa0b60aa620a44857db6..0b67ada170d4aa7e6d0295014fead4990eeecc71 100644 (file)
--- a/modules/access/dvd/Modules.am
+++ b/modules/access/dvd/Modules.am
@@ -1,19 +1,18 @@
 SOURCES_dvd = \
        modules/access/dvd/dvd.c \
+       modules/access/dvd/dvd.h \
        modules/access/dvd/access.c \
        modules/access/dvd/demux.c \
        modules/access/dvd/seek.c \
+       modules/access/dvd/seek.h \
        modules/access/dvd/es.c \
-       modules/access/dvd/ifo.c \
-       modules/access/dvd/udf.c \
-       modules/access/dvd/summary.c
-
-noinst_HEADERS += \
-       modules/access/dvd/dvdcss.h \
        modules/access/dvd/es.h \
-       modules/access/dvd/dvd.h \
+       modules/access/dvd/ifo.c \
        modules/access/dvd/ifo.h \
-       modules/access/dvd/seek.h \
+       modules/access/dvd/udf.c \
+       modules/access/dvd/udf.h \
+       modules/access/dvd/summary.c \
        modules/access/dvd/summary.h \
-       modules/access/dvd/udf.h
+       modules/access/dvd/dvdcss.h \
+       $(NULL)
 

diff --git a/modules/access/dvdplay/Modules.am b/modules/access/dvdplay/Modules.am
index 6909c527445eaed1919cb4c2d30a712f147a0bed..1c125dab2b6a9488c4e823b84508cc4137a5c878 100644 (file)
--- a/modules/access/dvdplay/Modules.am
+++ b/modules/access/dvdplay/Modules.am
@@ -1,16 +1,15 @@
 SOURCES_dvdplay = \
        modules/access/dvdplay/dvd.c \
+       modules/access/dvdplay/dvd.h \
        modules/access/dvdplay/access.c \
+       modules/access/dvdplay/access.h \
        modules/access/dvdplay/demux.c \
+       modules/access/dvdplay/demux.h \
        modules/access/dvdplay/intf.c \
+       modules/access/dvdplay/intf.h \
        modules/access/dvdplay/es.c \
-       modules/access/dvdplay/tools.c
-
-noinst_HEADERS += \
-       modules/access/dvdplay/access.h \
-       modules/access/dvdplay/demux.h \
-       modules/access/dvdplay/dvd.h \
        modules/access/dvdplay/es.h \
-       modules/access/dvdplay/intf.h \
-       modules/access/dvdplay/tools.h
+       modules/access/dvdplay/tools.c \
+       modules/access/dvdplay/tools.h \
+       $(NULL)
 

diff --git a/modules/access/dvdread/Modules.am b/modules/access/dvdread/Modules.am
index 332d43c039a442b6a32906e5f4fcc72971c73182..7d204f3bfb3eeac97f94846a41510c193697af9b 100644 (file)
--- a/modules/access/dvdread/Modules.am
+++ b/modules/access/dvdread/Modules.am
@@ -1,6 +1,6 @@
 SOURCES_dvdread = \
        modules/access/dvdread/dvdread.c \
-       modules/access/dvdread/input.c
+       modules/access/dvdread/input.c \
+       modules/access/dvdread/input.h \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/access/dvdread/input.h

diff --git a/modules/access/mms/Modules.am b/modules/access/mms/Modules.am
index 469414bcea7e3e9b537337c6d5732a2938230a87..fa7d95fb118199a93713d801f8d93806f14dbcfa 100644 (file)
--- a/modules/access/mms/Modules.am
+++ b/modules/access/mms/Modules.am
@@ -1,6 +1,7 @@
-SOURCES_access_mms = modules/access/mms/mms.c
-
-noinst_HEADERS += modules/access/mms/mms.h \
-                  modules/access/mms/var_buffer.h \
-                  modules/access/mms/asf.h
+SOURCES_access_mms = \
+       modules/access/mms/mms.c \
+       modules/access/mms/mms.h \
+       modules/access/mms/var_buffer.h \
+       modules/access/mms/asf.h \
+       $(NULL)
 

diff --git a/modules/access/satellite/Modules.am b/modules/access/satellite/Modules.am
index 0459280a3550a14272160fc2a5ab8d156baacd90..bab05cfcc3646bfa6648aea7e8cc75b8086e09dc 100644 (file)
--- a/modules/access/satellite/Modules.am
+++ b/modules/access/satellite/Modules.am
@@ -1,7 +1,7 @@
 SOURCES_satellite = \
        modules/access/satellite/satellite.c \
        modules/access/satellite/access.c \
-       modules/access/satellite/dvb.c
+       modules/access/satellite/dvb.c \
+       modules/access/satellite/dvb.h \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/access/satellite/dvb.h

diff --git a/modules/access/vcd/Modules.am b/modules/access/vcd/Modules.am
index 8764582b837ec0b20040314c4f3de13300229643..6f605d32310047be2714339c25dd12457c23a117 100644 (file)
--- a/modules/access/vcd/Modules.am
+++ b/modules/access/vcd/Modules.am
@@ -1,7 +1,6 @@
 SOURCES_vcd = \
        modules/access/vcd/vcd.c \
-       modules/access/vcd/cdrom.c
-
-noinst_HEADERS += \
        modules/access/vcd/vcd.h \
-       modules/access/vcd/cdrom.h
+       modules/access/vcd/cdrom.c \
+       modules/access/vcd/cdrom.h \
+       $(NULL)

diff --git a/modules/codec/a52old/Modules.am b/modules/codec/a52old/Modules.am
index dc9fc56d81731e658cd0a051b5e779e0cf003f89..27ffd84dbe7e677855d2ec9aedcb26ea09f6c42d 100644 (file)
--- a/modules/codec/a52old/Modules.am
+++ b/modules/codec/a52old/Modules.am
@@ -1,19 +1,18 @@
 SOURCES_a52old = \
        modules/codec/a52old/a52old.c \
+       modules/codec/a52old/adec.h \
+       modules/codec/a52old/internal.h \
        modules/codec/a52old/decoder.c \
+       modules/codec/a52old/decoder.h \
        modules/codec/a52old/parse.c \
        modules/codec/a52old/exponent.c \
+       modules/codec/a52old/exponent.h \
        modules/codec/a52old/bit_allocate.c \
        modules/codec/a52old/mantissa.c \
-       modules/codec/a52old/rematrix.c \
-       modules/codec/a52old/imdct.c
-
-noinst_HEADERS += \
-       modules/codec/a52old/adec.h \
-       modules/codec/a52old/decoder.h \
-       modules/codec/a52old/exponent.h \
-       modules/codec/a52old/internal.h \
        modules/codec/a52old/mantissa.h \
+       modules/codec/a52old/rematrix.c \
+       modules/codec/a52old/imdct.c \
        modules/codec/a52old/imdct.h \
-       modules/codec/a52old/downmix.h
+       modules/codec/a52old/downmix.h \
+       $(NULL)
 

diff --git a/modules/codec/a52old/downmix/Modules.am b/modules/codec/a52old/downmix/Modules.am
index 12b4e5271b30f09b1b651e68146f1e52781281c7..2bbfe40bb4fed12363a3b38b9a66c2feaea710fb 100644 (file)
--- a/modules/codec/a52old/downmix/Modules.am
+++ b/modules/codec/a52old/downmix/Modules.am
@@ -1,13 +1,18 @@
 SOURCES_downmix = \
        modules/codec/a52old/downmix/downmix.c \
-       modules/codec/a52old/downmix/downmix_c.c
+       modules/codec/a52old/downmix/downmix_c.c \
+       modules/codec/a52old/downmix/downmix_common.h \
+       $(NULL)
+
 SOURCES_downmixsse = \
        modules/codec/a52old/downmix/downmix.c \
-       modules/codec/a52old/downmix/downmix_sse.c
+       modules/codec/a52old/downmix/downmix_sse.c \
+       modules/codec/a52old/downmix/downmix_common.h \
+       $(NULL)
+
 SOURCES_downmix3dn = \
        modules/codec/a52old/downmix/downmix.c \
-       modules/codec/a52old/downmix/downmix_3dn.c
-
-noinst_HEADERS += \
-       modules/codec/a52old/downmix/downmix_common.h
+       modules/codec/a52old/downmix/downmix_3dn.c \
+       modules/codec/a52old/downmix/downmix_common.h \
+       $(NULL)
 

diff --git a/modules/codec/cinepak/Modules.am b/modules/codec/cinepak/Modules.am
index 60afa356d0b76e4a060f015f2064833fdc5a1610..85d62396c4900e1371daf2ffae56996ff17fd552 100644 (file)
--- a/modules/codec/cinepak/Modules.am
+++ b/modules/codec/cinepak/Modules.am
@@ -1,3 +1,4 @@
-SOURCES_cinepak = modules/codec/cinepak/cinepak.c
-
-noinst_HEADERS += modules/codec/cinepak/cinepak.h
+SOURCES_cinepak = \
+       modules/codec/cinepak/cinepak.c \
+       modules/codec/cinepak/cinepak.h \
+       $(NULL)

diff --git a/modules/codec/faad/Modules.am b/modules/codec/faad/Modules.am
index c446d930adf592025b2d2e2c96ac4d32d1a80846..4487515be770a0425c88a4ce79e95f5763ddff23 100644 (file)
--- a/modules/codec/faad/Modules.am
+++ b/modules/codec/faad/Modules.am
@@ -1,3 +1,4 @@
-SOURCES_faad = modules/codec/faad/decoder.c
-
-noinst_HEADERS += modules/codec/faad/decoder.h
+SOURCES_faad = \
+       modules/codec/faad/decoder.c \
+       modules/codec/faad/decoder.h \
+       $(NULL)

diff --git a/modules/codec/ffmpeg/Modules.am b/modules/codec/ffmpeg/Modules.am
index d98691028e1ada8c0a6435c8cec34c3fee5b5ec5..817dbc85537781763f2f3b08d6e863c6186b06ba 100644 (file)
--- a/modules/codec/ffmpeg/Modules.am
+++ b/modules/codec/ffmpeg/Modules.am
@@ -1,8 +1,9 @@
-SOURCES_ffmpeg = modules/codec/ffmpeg/ffmpeg.c \
-                 modules/codec/ffmpeg/video.c \
-                 modules/codec/ffmpeg/audio.c
-
-noinst_HEADERS += modules/codec/ffmpeg/ffmpeg.h \
-                 modules/codec/ffmpeg/video.h \
-                 modules/codec/ffmpeg/audio.h
+SOURCES_ffmpeg = \
+       modules/codec/ffmpeg/ffmpeg.c \
+       modules/codec/ffmpeg/ffmpeg.h \
+       modules/codec/ffmpeg/video.c \
+       modules/codec/ffmpeg/video.h \
+       modules/codec/ffmpeg/audio.c \
+       modules/codec/ffmpeg/audio.h \
+       $(NULL)
 

diff --git a/modules/codec/ffmpeg/postprocessing/Modules.am b/modules/codec/ffmpeg/postprocessing/Modules.am
index 7ceaf56b519f9773ecfea2ac071305fd09e48b78..6109d1806231d94bb38665b1a84280f8ab7ffd0c 100644 (file)
--- a/modules/codec/ffmpeg/postprocessing/Modules.am
+++ b/modules/codec/ffmpeg/postprocessing/Modules.am
@@ -1,16 +1,20 @@
 SOURCES_postprocessing_c = \
        modules/codec/ffmpeg/postprocessing/postprocessing.c \
-       modules/codec/ffmpeg/postprocessing/postprocessing_c.c
+       modules/codec/ffmpeg/postprocessing/postprocessing_c.c \
+       $(NULL)
 
 SOURCES_postprocessing_mmx = \
        modules/codec/ffmpeg/postprocessing/postprocessing.c \
-       modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c
+       modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c \
+       $(NULL)
 
 SOURCES_postprocessing_mmxext = \
        modules/codec/ffmpeg/postprocessing/postprocessing.c \
-       modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c
+       modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c \
+       $(NULL)
 
 noinst_HEADERS += \
        modules/codec/ffmpeg/postprocessing/postprocessing.h \
-       modules/codec/ffmpeg/postprocessing/postprocessing_common.h
+       modules/codec/ffmpeg/postprocessing/postprocessing_common.h \
+       $(NULL)
 

diff --git a/modules/codec/mad/Modules.am b/modules/codec/mad/Modules.am
index 2fe049e1f01804f6d13dde6829018f68b5c3454d..bec04d33fe3b065d34619e40d8997704c240199d 100644 (file)
--- a/modules/codec/mad/Modules.am
+++ b/modules/codec/mad/Modules.am
@@ -1,7 +1,6 @@
 SOURCES_mad = \
        modules/codec/mad/decoder.c \
-       modules/codec/mad/libmad.c
-
-noinst_HEADERS += \
+       modules/codec/mad/decoder.h \
+       modules/codec/mad/libmad.c \
        modules/codec/mad/libmad.h \
-       modules/codec/mad/decoder.h
+       $(NULL)

diff --git a/modules/codec/mpeg_audio/Modules.am b/modules/codec/mpeg_audio/Modules.am
index 343609149f8eff46e812a185e23129390a0dc115..8f204444be49eff48c558797d99313506ba43d27 100644 (file)
--- a/modules/codec/mpeg_audio/Modules.am
+++ b/modules/codec/mpeg_audio/Modules.am
@@ -1,14 +1,13 @@
 SOURCES_mpeg_audio = \
        modules/codec/mpeg_audio/decoder.c \
+       modules/codec/mpeg_audio/decoder.h \
        modules/codec/mpeg_audio/layer1.c \
-       modules/codec/mpeg_audio/layer2.c \
-       modules/codec/mpeg_audio/math.c \
-       modules/codec/mpeg_audio/generic.c
-
-noinst_HEADERS += \
        modules/codec/mpeg_audio/layer1.h \
+       modules/codec/mpeg_audio/layer2.c \
        modules/codec/mpeg_audio/layer2.h \
-       modules/codec/mpeg_audio/decoder.h \
+       modules/codec/mpeg_audio/math.c \
+       modules/codec/mpeg_audio/math.h \
+       modules/codec/mpeg_audio/generic.c \
        modules/codec/mpeg_audio/generic.h \
-       modules/codec/mpeg_audio/math.h
+       $(NULL)
 

diff --git a/modules/codec/mpeg_video/Modules.am b/modules/codec/mpeg_video/Modules.am
index dbee76ba0ec6884bbfb50b74b62606084437864a..f5014bf5456c3208f72a7e2feb99483b0387c869 100644 (file)
--- a/modules/codec/mpeg_video/Modules.am
+++ b/modules/codec/mpeg_video/Modules.am
@@ -1,15 +1,14 @@
 SOURCES_mpeg_video = \
        modules/codec/mpeg_video/parser.c \
+       modules/codec/mpeg_video/parser.h \
        modules/codec/mpeg_video/headers.c \
        modules/codec/mpeg_video/blocks.c \
+       modules/codec/mpeg_video/blocks.h \
        modules/codec/mpeg_video/synchro.c \
        modules/codec/mpeg_video/pool.c \
-       modules/codec/mpeg_video/decoder.c
-
-noinst_HEADERS += \
-       modules/codec/mpeg_video/decoder.h \
-       modules/codec/mpeg_video/parser.h \
-       modules/codec/mpeg_video/blocks.h \
        modules/codec/mpeg_video/pool.h \
-       modules/codec/mpeg_video/plugins.h
+       modules/codec/mpeg_video/decoder.c \
+       modules/codec/mpeg_video/decoder.h \
+       modules/codec/mpeg_video/plugins.h \
+       $(NULL)
 

diff --git a/modules/codec/mpeg_video/idct/Modules.am b/modules/codec/mpeg_video/idct/Modules.am
index b46ae3f780d173b968603060b73244d6421451e9..6302a0c3c0efc254ae2fa3a908c4d266ad4d93b3 100644 (file)
--- a/modules/codec/mpeg_video/idct/Modules.am
+++ b/modules/codec/mpeg_video/idct/Modules.am
@@ -1,13 +1,37 @@
-SOURCES_idct = modules/codec/mpeg_video/idct/idct.c
-SOURCES_idctclassic = modules/codec/mpeg_video/idct/idctclassic.c
-SOURCES_idctmmx = modules/codec/mpeg_video/idct/idctmmx.c
-SOURCES_idctmmxext = modules/codec/mpeg_video/idct/idctmmxext.c
-SOURCES_idctaltivec = modules/codec/mpeg_video/idct/idctaltivec.c
+SOURCES_idct = \
+       modules/codec/mpeg_video/idct/idct.c \
+       modules/codec/mpeg_video/idct/idct.h \
+       modules/codec/mpeg_video/idct/idct_decl.h \
+       modules/codec/mpeg_video/idct/idct_sparse.h \
+       modules/codec/mpeg_video/idct/block_c.h \
+       $(NULL)
 
-noinst_HEADERS += \
+SOURCES_idctclassic = \
+       modules/codec/mpeg_video/idct/idctclassic.c \
+       modules/codec/mpeg_video/idct/idct.h \
+       modules/codec/mpeg_video/idct/idct_decl.h \
+       modules/codec/mpeg_video/idct/idct_sparse.h \
        modules/codec/mpeg_video/idct/block_c.h \
+       $(NULL)
+
+SOURCES_idctmmx = \
+       modules/codec/mpeg_video/idct/idctmmx.c \
+       modules/codec/mpeg_video/idct/idct.h \
+       modules/codec/mpeg_video/idct/idct_decl.h \
+       modules/codec/mpeg_video/idct/idct_sparse.h \
        modules/codec/mpeg_video/idct/block_mmx.h \
+       $(NULL)
+
+SOURCES_idctmmxext = \
+       modules/codec/mpeg_video/idct/idctmmxext.c \
        modules/codec/mpeg_video/idct/idct.h \
        modules/codec/mpeg_video/idct/idct_decl.h \
-       modules/codec/mpeg_video/idct/idct_sparse.h
+       modules/codec/mpeg_video/idct/idct_sparse.h \
+       modules/codec/mpeg_video/idct/block_mmx.h \
+       $(NULL)
+
+SOURCES_idctaltivec = \
+       modules/codec/mpeg_video/idct/idctaltivec.c \
+       modules/codec/mpeg_video/idct/idct.h \
+       $(NULL)
 

diff --git a/modules/codec/spudec/Modules.am b/modules/codec/spudec/Modules.am
index 78a219d899c934962a935c256f3be2e025f116a4..856b349faeedf654cb59f430c1bdb1fba41d2eba 100644 (file)
--- a/modules/codec/spudec/Modules.am
+++ b/modules/codec/spudec/Modules.am
@@ -3,7 +3,6 @@ SOURCES_spudec = \
        modules/codec/spudec/parse.c \
        modules/codec/spudec/render.c \
        modules/codec/spudec/text.c \
-       modules/codec/spudec/subtitler.c
-
-noinst_HEADERS += \
-       modules/codec/spudec/spudec.h
+       modules/codec/spudec/subtitler.c \
+       modules/codec/spudec/spudec.h \
+       $(NULL)

diff --git a/modules/demux/asf/Modules.am b/modules/demux/asf/Modules.am
index 08884f56b9e45dd3d74115d4d4672d6704c93033..c1f68f4a2d2df51d4a2253983560ab1524bb773a 100644 (file)
--- a/modules/demux/asf/Modules.am
+++ b/modules/demux/asf/Modules.am
@@ -1,8 +1,6 @@
 SOURCES_asf = \
        modules/demux/asf/asf.c \
-       modules/demux/asf/libasf.c
-
-
-noinst_HEADERS += \
        modules/demux/asf/asf.h \
-    modules/demux/asf/libasf.h
+       modules/demux/asf/libasf.c \
+       modules/demux/asf/libasf.h \
+       $(NULL)

diff --git a/modules/demux/avi/Modules.am b/modules/demux/avi/Modules.am
index 743c15ce1528fef2794dbef70b8da5c33f8d3149..7c65467f2fe9ede583dc425e7e20da5aed97f9a9 100644 (file)
--- a/modules/demux/avi/Modules.am
+++ b/modules/demux/avi/Modules.am
@@ -1,8 +1,6 @@
 SOURCES_avi = \
        modules/demux/avi/avi.c \
-    modules/demux/avi/libavi.c
-
-
-noinst_HEADERS += \
        modules/demux/avi/avi.h \
-    modules/demux/avi/libavi.h
+       modules/demux/avi/libavi.c \
+       modules/demux/avi/libavi.h \
+       $(NULL)

diff --git a/modules/demux/mp4/Modules.am b/modules/demux/mp4/Modules.am
index b5828a2864ddf53eefe4a1e9721f2d85473be949..512dfdec70eaa3074afa73670429199ca4e29f98 100644 (file)
--- a/modules/demux/mp4/Modules.am
+++ b/modules/demux/mp4/Modules.am
@@ -1,7 +1,6 @@
 SOURCES_mp4 = \
        modules/demux/mp4/mp4.c \
-       modules/demux/mp4/libmp4.c
-
-noinst_HEADERS += \
        modules/demux/mp4/mp4.h \
-       modules/demux/mp4/libmp4.h
+       modules/demux/mp4/libmp4.c \
+       modules/demux/mp4/libmp4.h \
+       $(NULL)

diff --git a/modules/demux/mpeg/Modules.am b/modules/demux/mpeg/Modules.am
index b86b9f122569e65d7821ea7a0d43e326df9c6d7b..d854660af0609baf9b683741fb1d73fef2094816 100644 (file)
--- a/modules/demux/mpeg/Modules.am
+++ b/modules/demux/mpeg/Modules.am
@@ -1,8 +1,25 @@
-SOURCES_mpeg_system = modules/demux/mpeg/system.c
-SOURCES_es = modules/demux/mpeg/es.c
-SOURCES_ps = modules/demux/mpeg/ps.c
-SOURCES_ts = modules/demux/mpeg/ts.c
-SOURCES_ts_dvbpsi = modules/demux/mpeg/ts.c
-SOURCES_audio = modules/demux/mpeg/audio.c
-
-noinst_HEADERS += modules/demux/mpeg/system.h
+SOURCES_mpeg_system = \
+       modules/demux/mpeg/system.c \
+       modules/demux/mpeg/system.h \
+       $(NULL)
+
+SOURCES_es = \
+       modules/demux/mpeg/es.c \
+       $(NULL)
+
+SOURCES_ps = \
+       modules/demux/mpeg/ps.c \
+       $(NULL)
+
+SOURCES_ts = \
+       modules/demux/mpeg/ts.c \
+       $(NULL)
+
+SOURCES_ts_dvbpsi = \
+       modules/demux/mpeg/ts.c \
+       $(NULL)
+
+SOURCES_audio = \
+       modules/demux/mpeg/audio.c \
+       $(NULL)
+

diff --git a/modules/demux/util/Modules.am b/modules/demux/util/Modules.am
index 53809899a86f348d837091b0e05a76f4f000d4d6..9a91ee65768a75b6e0457422a9be041a38364f01 100644 (file)
--- a/modules/demux/util/Modules.am
+++ b/modules/demux/util/Modules.am
@@ -1,7 +1,13 @@
-SOURCES_id3 = modules/demux/util/id3.c
-SOURCES_id3tag = modules/demux/util/id3tag.c
-SOURCES_demuxsub = modules/demux/util/sub.c
+SOURCES_id3 = \
+       modules/demux/util/id3.c \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/demux/util/sub.h
+SOURCES_id3tag = \
+       modules/demux/util/id3tag.c \
+       $(NULL)
+
+SOURCES_demuxsub = \
+       modules/demux/util/sub.c \
+       modules/demux/util/sub.h \
+       $(NULL)
 

diff --git a/modules/demux/wav/Modules.am b/modules/demux/wav/Modules.am
index 0369488972cec728bc23c2bd3c9fde758c46b6bd..923a5b0121e59a5ab046b07cc89f8c575cc6ba38 100644 (file)
--- a/modules/demux/wav/Modules.am
+++ b/modules/demux/wav/Modules.am
@@ -1,5 +1,4 @@
 SOURCES_wav = \
-       modules/demux/wav/wav.c
-
-noinst_HEADERS += \
-       modules/demux/wav/wav.h
+       modules/demux/wav/wav.c \
+       modules/demux/wav/wav.h \
+       $(NULL)

diff --git a/modules/gui/beos/Modules.am b/modules/gui/beos/Modules.am
index 5cc8e5d74467850ac417dae5632a2bbb97d999e3..e4cd1da08f7f8607e12a67f62c57f3f8d25137a5 100644 (file)
--- a/modules/gui/beos/Modules.am
+++ b/modules/gui/beos/Modules.am
@@ -4,24 +4,23 @@ SOURCES_beos = \
        modules/gui/beos/VideoOutput.cpp \
        modules/gui/beos/Interface.cpp \
        modules/gui/beos/InterfaceWindow.cpp \
+       modules/gui/beos/InterfaceWindow.h \
        modules/gui/beos/ListViews.cpp \
+       modules/gui/beos/ListViews.h \
        modules/gui/beos/DrawingTidbits.cpp \
+       modules/gui/beos/DrawingTidbits.h \
        modules/gui/beos/TransportButton.cpp \
+       modules/gui/beos/TransportButton.h \
        modules/gui/beos/PlayListWindow.cpp \
+       modules/gui/beos/PlayListWindow.h \
        modules/gui/beos/PreferencesWindow.cpp \
+       modules/gui/beos/PreferencesWindow.h \
        modules/gui/beos/MediaControlView.cpp \
-       modules/gui/beos/VlcWrapper.cpp
-
-noinst_HEADERS += \
-       modules/gui/beos/Bitmaps.h \
-       modules/gui/beos/DrawingTidbits.h \
-       modules/gui/beos/InterfaceWindow.h \
-       modules/gui/beos/ListViews.h \
        modules/gui/beos/MediaControlView.h \
+       modules/gui/beos/VlcWrapper.cpp \
+       modules/gui/beos/VlcWrapper.h \
+       modules/gui/beos/Bitmaps.h \
        modules/gui/beos/MsgVals.h \
-       modules/gui/beos/PlayListWindow.h \
-       modules/gui/beos/PreferencesWindow.h \
-       modules/gui/beos/TransportButton.h \
        modules/gui/beos/VideoWindow.h \
-       modules/gui/beos/VlcWrapper.h
+       $(NULL)
 

diff --git a/modules/gui/familiar/Modules.am b/modules/gui/familiar/Modules.am
index 80f8999fbc59ac7d28ec42c37b019ef83cc8b308..a2be9f2cff1894387e47ce0283d8145df0db3a3c 100644 (file)
--- a/modules/gui/familiar/Modules.am
+++ b/modules/gui/familiar/Modules.am
@@ -1,13 +1,12 @@
 SOURCES_familiar = \
        modules/gui/familiar/familiar.c \
+       modules/gui/familiar/familiar.h \
        modules/gui/familiar/interface.c \
+       modules/gui/familiar/interface.h \
        modules/gui/familiar/support.c \
-       modules/gui/familiar/callbacks.c
-
-noinst_HEADERS += \
+       modules/gui/familiar/support.h \
+       modules/gui/familiar/callbacks.c \
        modules/gui/familiar/callbacks.h \
-       modules/gui/familiar/familiar.h \
-       modules/gui/familiar/interface.h \
-       modules/gui/familiar/support.h
+       $(NULL)
 
 EXTRA_DIST += modules/gui/familiar/familiar.glade

diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am
index 7af19a08c22385c12152a4f7992e47aa0ba22ad7..d659f94988c492e3220cac348795bc426c466dd7 100644 (file)
--- a/modules/gui/macosx/Modules.am
+++ b/modules/gui/macosx/Modules.am
@@ -2,19 +2,18 @@ SOURCES_macosx = \
        modules/gui/macosx/macosx.m \
        modules/gui/macosx/aout.m \
        modules/gui/macosx/vout.m \
+       modules/gui/macosx/vout.h \
        modules/gui/macosx/intf.m \
-       modules/gui/macosx/open.m \
-       modules/gui/macosx/prefs.m \
-       modules/gui/macosx/playlist.m \
-       modules/gui/macosx/controls.m \
-        modules/gui/macosx/asystm.m
-
-noinst_HEADERS += \
        modules/gui/macosx/intf.h \
+       modules/gui/macosx/open.m \
        modules/gui/macosx/open.h \
+       modules/gui/macosx/prefs.m \
        modules/gui/macosx/prefs.h \
+       modules/gui/macosx/playlist.m \
        modules/gui/macosx/playlist.h \
-       modules/gui/macosx/vout.h \
+       modules/gui/macosx/controls.m \
+        modules/gui/macosx/asystm.m \
+       modules/gui/macosx/asystm.h \
        modules/gui/macosx/adev_discovery.h \
-       modules/gui/macosx/asystm.h
+       $(NULL)
 

diff --git a/modules/gui/wxwindows/Modules.am b/modules/gui/wxwindows/Modules.am
index c181d6d7c106b6ebfc297c5005576d757d1ed4f8..a0956d6511f53cd0975ff1a518b5b9428ca69854 100644 (file)
--- a/modules/gui/wxwindows/Modules.am
+++ b/modules/gui/wxwindows/Modules.am
@@ -1,10 +1,9 @@
 SOURCES_wxwindows = \
        modules/gui/wxwindows/wxwindows.cpp \
+       modules/gui/wxwindows/wxwindows.h \
        modules/gui/wxwindows/interface.cpp \
-       modules/gui/wxwindows/timer.cpp
-
-noinst_HEADERS += \
-       modules/gui/wxwindows/wxwindows.h
+       modules/gui/wxwindows/timer.cpp \
+       $(NULL)
 
 EXTRA_DIST += \
        modules/gui/wxwindows/bitmaps/file.xpm \

diff --git a/modules/misc/dummy/Modules.am b/modules/misc/dummy/Modules.am
index 8ee7c79309470181b3d7b07bd72ccad94efab248..e0fe6d87276f748db5da660f50b9b27023a1c1da 100644 (file)
--- a/modules/misc/dummy/Modules.am
+++ b/modules/misc/dummy/Modules.am
@@ -1,10 +1,10 @@
 SOURCES_dummy = \
        modules/misc/dummy/dummy.c \
+       modules/misc/dummy/dummy.h \
        modules/misc/dummy/aout.c \
        modules/misc/dummy/vout.c \
        modules/misc/dummy/interface.c \
        modules/misc/dummy/input.c \
-       modules/misc/dummy/decoder.c
+       modules/misc/dummy/decoder.c \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/misc/dummy/dummy.h

diff --git a/modules/misc/memcpy/Modules.am b/modules/misc/memcpy/Modules.am
index ebf02bf599717917e8dcf648b6e2ec665fb111ac..236ac59b46fd688179b747fd3466f7a9cce19774 100644 (file)
--- a/modules/misc/memcpy/Modules.am
+++ b/modules/misc/memcpy/Modules.am
@@ -1,8 +1,23 @@
-SOURCES_memcpy = modules/misc/memcpy/memcpy.c
-SOURCES_memcpymmx = modules/misc/memcpy/memcpy.c
-SOURCES_memcpymmxext = modules/misc/memcpy/memcpy.c
-SOURCES_memcpy3dn = modules/misc/memcpy/memcpy.c
-SOURCES_memcpyaltivec = modules/misc/memcpy/memcpyaltivec.c
+SOURCES_memcpy = \
+       modules/misc/memcpy/memcpy.c \
+       $(NULL)
 
-noinst_HEADERS += modules/misc/memcpy/fastmemcpy.h
+SOURCES_memcpymmx = \
+       modules/misc/memcpy/memcpy.c \
+       modules/misc/memcpy/fastmemcpy.h \
+       $(NULL)
+
+SOURCES_memcpymmxext = \
+       modules/misc/memcpy/memcpy.c \
+       modules/misc/memcpy/fastmemcpy.h \
+       $(NULL)
+
+SOURCES_memcpy3dn = \
+       modules/misc/memcpy/memcpy.c \
+       modules/misc/memcpy/fastmemcpy.h \
+       $(NULL)
+
+SOURCES_memcpyaltivec = \
+       modules/misc/memcpy/memcpyaltivec.c \
+       $(NULL)
 

diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am
index 2a6adce69ab4fb8cf862bcfbe1cf44cc32e499d7..d667a97e855ddaf6bedf40587fc6ad030595dfa4 100644 (file)
--- a/modules/video_chroma/Modules.am
+++ b/modules/video_chroma/Modules.am
@@ -1,23 +1,42 @@
 SOURCES_i420_rgb = \
        modules/video_chroma/i420_rgb.c \
+       modules/video_chroma/i420_rgb.h \
        modules/video_chroma/i420_rgb8.c \
-       modules/video_chroma/i420_rgb16.c
+       modules/video_chroma/i420_rgb16.c \
+       $(NULL)
+
 SOURCES_i420_rgb_mmx = \
        modules/video_chroma/i420_rgb.c \
-       modules/video_chroma/i420_rgb16.c
+       modules/video_chroma/i420_rgb.h \
+       modules/video_chroma/i420_rgb16.c \
+       modules/video_chroma/i420_rgb_mmx.h \
+       $(NULL)
+
+SOURCES_i420_yuy2 = \
+       modules/video_chroma/i420_yuy2.c \
+       modules/video_chroma/i420_yuy2.h \
+       $(NULL)
 
-SOURCES_i420_yuy2 = modules/video_chroma/i420_yuy2.c
-SOURCES_i420_yuy2_mmx = modules/video_chroma/i420_yuy2.c
+SOURCES_i420_yuy2_mmx = \
+       modules/video_chroma/i420_yuy2.c \
+       modules/video_chroma/i420_yuy2.h \
+       $(NULL)
 
-SOURCES_i422_yuy2 = modules/video_chroma/i422_yuy2.c
-SOURCES_i422_yuy2_mmx = modules/video_chroma/i422_yuy2.c
+SOURCES_i422_yuy2 = \
+       modules/video_chroma/i422_yuy2.c \
+       modules/video_chroma/i422_yuy2.h \
+       $(NULL)
 
-SOURCES_i420_ymga = modules/video_chroma/i420_ymga.c
-SOURCES_i420_ymga_mmx = modules/video_chroma/i420_ymga.c
+SOURCES_i422_yuy2_mmx = \
+       modules/video_chroma/i422_yuy2.c \
+       modules/video_chroma/i422_yuy2.h \
+       $(NULL)
+
+SOURCES_i420_ymga = \
+       modules/video_chroma/i420_ymga.c
+       $(NULL)
+
+SOURCES_i420_ymga_mmx = \
+       modules/video_chroma/i420_ymga.c
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/video_chroma/i420_rgb.h \
-       modules/video_chroma/i420_rgb_c.h \
-       modules/video_chroma/i420_rgb_mmx.h \
-       modules/video_chroma/i420_yuy2.h \
-       modules/video_chroma/i422_yuy2.h

diff --git a/modules/video_output/directx/Modules.am b/modules/video_output/directx/Modules.am
index 7941d2acea9e1af116bcb8d8d8e6cc7f8f0ea410..f0807beb0b22f7863b1a66bcfd9a0b370953ac79 100644 (file)
--- a/modules/video_output/directx/Modules.am
+++ b/modules/video_output/directx/Modules.am
@@ -1,6 +1,6 @@
 SOURCES_vout_directx = \
        modules/video_output/directx/directx.c \
-       modules/video_output/directx/events.c
+       modules/video_output/directx/vout.h \
+       modules/video_output/directx/events.c \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/video_output/directx/vout.h

diff --git a/modules/video_output/qte/Modules.am b/modules/video_output/qte/Modules.am
index f3cfce9ef70a5cb25114e0f7e9c5a61a03e8db3c..3d0f69ff85b8ef574607fff0575acf272987d3bf 100644 (file)
--- a/modules/video_output/qte/Modules.am
+++ b/modules/video_output/qte/Modules.am
@@ -1,5 +1,4 @@
 SOURCES_qte = \
-       modules/video_output/qte/qte.cpp
-
-noinst_HEADERS += \
-       modules/video_output/qte/qte.h
+       modules/video_output/qte/qte.cpp \
+       modules/video_output/qte/qte.h \
+       $(NULL)

diff --git a/modules/video_output/x11/Modules.am b/modules/video_output/x11/Modules.am
index db3beab46f8724bf23d8eefc75c61b6a6821bc54..f8100aad981019241b0d13c3d11a1bd41a05ba0b 100644 (file)
--- a/modules/video_output/x11/Modules.am
+++ b/modules/video_output/x11/Modules.am
@@ -1,9 +1,12 @@
 SOURCES_x11 = \
        modules/video_output/x11/x11.c \
-       modules/video_output/x11/xcommon.c
+       modules/video_output/x11/xcommon.c \
+       modules/video_output/x11/xcommon.h \
+       $(NULL)
+
 SOURCES_xvideo = \
        modules/video_output/x11/xvideo.c \
-       modules/video_output/x11/xcommon.c
+       modules/video_output/x11/xcommon.c \
+       modules/video_output/x11/xcommon.h \
+       $(NULL)
 
-noinst_HEADERS += \
-       modules/video_output/x11/xcommon.h

diff --git a/src/extras/libc.c b/src/extras/libc.c
index 99c44643525809c377fbd6d5f3b131b66fa6fd56..b78c775dc0c36a7b7621502f874e070065c59ff2 100644 (file)
--- a/src/extras/libc.c
+++ b/src/extras/libc.c
@@ -2,7 +2,7 @@
  * libc.c: Extra libc function for some systems.
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: libc.c,v 1.3 2002/11/13 20:51:04 sam Exp $
+ * $Id: libc.c,v 1.4 2002/11/20 08:58:24 sam Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Samuel Hocevar <sam@zoy.org>
@@ -30,7 +30,7 @@
  * getenv: just in case, but it should never be called
  *****************************************************************************/
 #ifndef HAVE_GETENV
-char *getenv( const char *name )
+char *vlc_getenv( const char *name )
 {
     return NULL;
 }
@@ -40,7 +40,7 @@ char *getenv( const char *name )
  * strdup: returns a malloc'd copy of a string 
  *****************************************************************************/
 #ifndef HAVE_STRDUP
-char *strdup( const char *string )
+char *vlc_strdup( const char *string )
 {
     return strndup( string, strlen( string ) );
 }
@@ -51,7 +51,7 @@ char *strdup( const char *string )
  * Does anyone know whether or not it will be present in Jaguar?
  *****************************************************************************/
 #ifndef HAVE_STRNDUP
-char *strndup( const char *string, size_t n )
+char *vlc_strndup( const char *string, size_t n )
 {
     char *psz;
     size_t len = strlen( string );
@@ -65,7 +65,7 @@ char *strndup( const char *string, size_t n )
         psz[ len ] = 0;
     }
 
-    return( psz );
+    return psz;
 }
 #endif
 
@@ -73,7 +73,7 @@ char *strndup( const char *string, size_t n )
  * strcasecmp: compare two strings ignoring case
  *****************************************************************************/
 #if !defined( HAVE_STRCASECMP ) && !defined( HAVE_STRICMP )
-int strcasecmp( const char *s1, const char *s2 )
+int vlc_strcasecmp( const char *s1, const char *s2 )
 {
     int i_delta = 0;
 
@@ -100,7 +100,7 @@ int strcasecmp( const char *s1, const char *s2 )
  * strncasecmp: compare n chars from two strings ignoring case
  *****************************************************************************/
 #if !defined( HAVE_STRNCASECMP ) && !defined( HAVE_STRNICMP )
-int strncasecmp( const char *s1, const char *s2, size_t n )
+int vlc_strncasecmp( const char *s1, const char *s2, size_t n )
 {
     int i_delta = 0;
 
@@ -127,7 +127,7 @@ int strncasecmp( const char *s1, const char *s2, size_t n )
  * atof: convert a string to a double.
  *****************************************************************************/
 #ifndef HAVE_ATOF
-double atof( const char *nptr )
+double vlc_atof( const char *nptr )
 { 
     double f_result;
     wchar_t *psz_tmp;
@@ -148,7 +148,7 @@ double atof( const char *nptr )
  * FIXME: this cast sucks!
  *****************************************************************************/
 #if !defined( HAVE_LSEEK )
-off_t lseek( int fildes, off_t offset, int whence )
+off_t vlc_lseek( int fildes, off_t offset, int whence )
 {
     return SetFilePointer( (HANDLE)fildes, (long)offset, NULL, whence );
 }