[vlc-commits] Remove recursion into modules/codec/loader/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 15:57:52 2012 +0300| [fcc20e9224f621e0267350d4483896520ab57017] | committer: Rémi Denis-Courmont

Remove recursion into modules/codec/loader/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fcc20e9224f621e0267350d4483896520ab57017
---

 configure.ac                     |    5 ++---
 modules/codec/Modules.am         |   33 ++++++++++++++++++++++++++++++++-
 modules/codec/loader/Makefile.am |   34 ----------------------------------
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4a62ef6..fbb079f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3980,8 +3980,8 @@ AC_ARG_ENABLE(loader,
 AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
 AS_IF([test "${enable_loader}" = "yes"],
   [ VLC_ADD_PLUGIN([dmo])
-    VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\${top_srcdir}/modules/codec/loader])
-    VLC_ADD_LIBS([dmo quicktime ],[\\\${top_builddir}/modules/codec/loader/libloader.la])
+    VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\$(srcdir)/loader])
+    VLC_ADD_LIBS([dmo quicktime ],[libloader.la])
     VLC_ADD_LIBS([dmo quicktime], [-lpthread])
   ])
 
@@ -4065,7 +4065,6 @@ AC_CONFIG_FILES([
   modules/audio_mixer/Makefile
   modules/audio_output/Makefile
   modules/codec/Makefile
-  modules/codec/loader/Makefile
   modules/control/Makefile
   modules/demux/Makefile
   modules/gui/Makefile
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 4dc6fd8..0ff0955 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,3 @@
-SUBDIRS = loader
 noinst_HEADERS =
 
 SOURCES_a52 = a52.c a52.h
@@ -146,3 +145,35 @@ libiomx_plugin_la_LIBADD = $(libomxil_plugin_la_LIBADD)
 
 libvlc_LTLIBRARIES += $(LTLIBomxil) $(LTLIBiomx)
 EXTRA_LTLIBRARIES += libomxil_plugin.la libiomx_plugin.la
+
+### Windows DLL loader ###
+
+# TODO: real check for vsscanf() and <sys/mmap.h>
+noinst_HEADERS += loader/com.h loader/driver.h loader/ext.h loader/ldt_keeper.h
+	loader/loader.h loader/registry.h \
+	loader/win32.h loader/wineacm.h loader/wrapper.h \
+	loader/qtx/qtxsdk/components.h \
+	loader/wine/avifmt.h loader/wine/basetsd.h loader/wine/debugtools.h \
+	loader/wine/driver.h loader/wine/heap.h loader/wine/mmreg.h \
+	loader/wine/module.h loader/wine/msacmdrv.h loader/wine/msacm.h \
+	loader/wine/pe_image.h loader/wine/poppack.h loader/wine/pshpack1.h \
+	loader/wine/pshpack2.h loader/wine/vfw.h loader/wine/winbase.h \
+	loader/wine/windef.h loader/wine/winerror.h \
+	loaeder/wine/winestring.h loader/wine/winnt.h loader/wine/winreg.h \
+	loader/wine/winuser.h
+
+libloader_la_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
+	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
+libloader_la_CFLAGS = -fno-PIC -U_FILE_OFFSET_BITS \
+	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
+libloader_la_SOURCES = loader/ldt_keeper.c loader/pe_image.c loader/module.c \
+	loader/ext.c loader/win32.c loader/driver.c loader/pe_resource.c \
+	loader/resource.c loader/registry.c loader/afl.c loader/vfl.c \
+	loader/wrapper.S loader/stubs.s loader/kludge.c
+libloader_la_LIBADD = -lpthread
+libloader_la_LDFLAGS = -static
+if LOADER
+noinst_LTLIBRARIES = libloader.la
+libdmo_plugin_la_DEPENDENCIES = libloader.la
+libquicktime_plugin_la_DEPENDENCIES = libloader.la
+endif
diff --git a/modules/codec/loader/Makefile.am b/modules/codec/loader/Makefile.am
deleted file mode 100644
index 9df1456..0000000
--- a/modules/codec/loader/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Makefile to build MPlayer's DLL loader
-# from VLC trunk
-#
-# by Rémi Denis-Courmont <rem # videolan.org>
-# $Id$
-#
-# All other files in this directory (and subdirectories) are copyrighted
-# by their respective owner(s).
-#
-
-if LOADER
-noinst_LTLIBRARIES = libloader.la
-endif
-
-# TODO: real check for vsscanf() and <sys/mmap.h>
-AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
-	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
-AM_CFLAGS = -fno-PIC -U_FILE_OFFSET_BITS \
-	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
-
-noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
-	win32.h wineacm.h wrapper.h qtx/qtxsdk/components.h \
-	wine/avifmt.h wine/basetsd.h wine/debugtools.h wine/driver.h \
-	wine/heap.h wine/mmreg.h wine/module.h wine/msacmdrv.h wine/msacm.h \
-	wine/pe_image.h wine/poppack.h wine/pshpack1.h wine/pshpack2.h \
-	wine/vfw.h wine/winbase.h wine/windef.h wine/winerror.h \
-	wine/winestring.h wine/winnt.h wine/winreg.h wine/winuser.h
-
-libloader_la_SOURCES = ldt_keeper.c pe_image.c module.c ext.c win32.c \
-	driver.c pe_resource.c resource.c registry.c afl.c vfl.c \
-	wrapper.S stubs.s kludge.c
-libloader_la_LIBADD = -lpthread
-