Move libs/loader to modules/codec/loader

diff --git a/Makefile.am b/Makefile.am
index d22eb8c57b12485d2dfe9da89314d50127e0a8b1..2598ba4788f77018816e48b21f2910da9df19671 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,13 +9,10 @@
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po compat src bin modules share doc test
 EXTRA_SUBDIRS = m4 \
-       libs/loader libs/srtp
+       libs/srtp
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po compat src
-if LOADER
-SUBDIRS += libs/loader
-endif
 if HAVE_GCRYPT
 SUBDIRS += libs/srtp
 endif

diff --git a/configure.ac b/configure.ac
index fad2e097c0ebf2d3b2436f3d0e33ed96fc039f79..277e6e50355c527f744e88f84177029bd6bfa7bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4175,8 +4175,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 realvideo],[-I\\\${top_srcdir}/libs/loader])
-    VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/libs/loader/libloader.la])
+    VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/modules/codec/loader])
+    VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/modules/codec/loader/libloader.la])
     VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
     VLC_ADD_LIBS([dmo quicktime], [-lpthread])
   ])
@@ -4259,7 +4259,6 @@ AC_SUBST(FILE_LIBVLC_DLL)
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
-  libs/loader/Makefile
   libs/srtp/Makefile
   modules/Makefile
   m4/Makefile
@@ -4288,6 +4287,7 @@ AC_CONFIG_FILES([
   modules/codec/Makefile
   modules/codec/avcodec/Makefile
   modules/codec/dmo/Makefile
+  modules/codec/loader/Makefile
   modules/codec/omxil/Makefile
   modules/codec/shine/Makefile
   modules/codec/spudec/Makefile

diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 10ca9150fe247420b20f0064a930097ae3d5a169..758af571066c42c9c5ed084111dd364c981443ec 100644 (file)
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = dmo avcodec shine spudec wmafixed omxil
+SUBDIRS = loader dmo avcodec shine spudec wmafixed omxil
 SOURCES_a52 = a52.c a52.h
 SOURCES_dts = dts.c
 SOURCES_flac = flac.c

diff --git a/libs/loader/Makefile.am b/modules/codec/loader/Makefile.am
similarity index 98%
rename from libs/loader/Makefile.am
rename to modules/codec/loader/Makefile.am
index 23ce88dd55d62e96f4d6bc32506d370b714feb35..9df1456f048d0d7a1ba818f7fe23e663f141355d 100644 (file)
--- a/libs/loader/Makefile.am
+++ b/modules/codec/loader/Makefile.am
@@ -9,7 +9,9 @@
 # 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 \

diff --git a/libs/loader/afl.c b/modules/codec/loader/afl.c
similarity index 100%
rename from libs/loader/afl.c
rename to modules/codec/loader/afl.c

diff --git a/libs/loader/com.h b/modules/codec/loader/com.h
similarity index 100%
rename from libs/loader/com.h
rename to modules/codec/loader/com.h

diff --git a/libs/loader/driver.c b/modules/codec/loader/driver.c
similarity index 100%
rename from libs/loader/driver.c
rename to modules/codec/loader/driver.c

diff --git a/libs/loader/driver.h b/modules/codec/loader/driver.h
similarity index 100%
rename from libs/loader/driver.h
rename to modules/codec/loader/driver.h

diff --git a/libs/loader/ext.c b/modules/codec/loader/ext.c
similarity index 100%
rename from libs/loader/ext.c
rename to modules/codec/loader/ext.c

diff --git a/libs/loader/ext.h b/modules/codec/loader/ext.h
similarity index 100%
rename from libs/loader/ext.h
rename to modules/codec/loader/ext.h

diff --git a/libs/loader/kludge.c b/modules/codec/loader/kludge.c
similarity index 100%
rename from libs/loader/kludge.c
rename to modules/codec/loader/kludge.c

diff --git a/libs/loader/ldt_keeper.c b/modules/codec/loader/ldt_keeper.c
similarity index 100%
rename from libs/loader/ldt_keeper.c
rename to modules/codec/loader/ldt_keeper.c

diff --git a/libs/loader/ldt_keeper.h b/modules/codec/loader/ldt_keeper.h
similarity index 100%
rename from libs/loader/ldt_keeper.h
rename to modules/codec/loader/ldt_keeper.h

diff --git a/libs/loader/loader.h b/modules/codec/loader/loader.h
similarity index 100%
rename from libs/loader/loader.h
rename to modules/codec/loader/loader.h

diff --git a/libs/loader/module.c b/modules/codec/loader/module.c
similarity index 100%
rename from libs/loader/module.c
rename to modules/codec/loader/module.c

diff --git a/libs/loader/pe_image.c b/modules/codec/loader/pe_image.c
similarity index 100%
rename from libs/loader/pe_image.c
rename to modules/codec/loader/pe_image.c

diff --git a/libs/loader/pe_resource.c b/modules/codec/loader/pe_resource.c
similarity index 100%
rename from libs/loader/pe_resource.c
rename to modules/codec/loader/pe_resource.c

diff --git a/libs/loader/qtx/qtxsdk/components.h b/modules/codec/loader/qtx/qtxsdk/components.h
similarity index 100%
rename from libs/loader/qtx/qtxsdk/components.h
rename to modules/codec/loader/qtx/qtxsdk/components.h

diff --git a/libs/loader/registry.c b/modules/codec/loader/registry.c
similarity index 100%
rename from libs/loader/registry.c
rename to modules/codec/loader/registry.c

diff --git a/libs/loader/registry.h b/modules/codec/loader/registry.h
similarity index 100%
rename from libs/loader/registry.h
rename to modules/codec/loader/registry.h

diff --git a/libs/loader/resource.c b/modules/codec/loader/resource.c
similarity index 100%
rename from libs/loader/resource.c
rename to modules/codec/loader/resource.c

diff --git a/libs/loader/stubs.s b/modules/codec/loader/stubs.s
similarity index 100%
rename from libs/loader/stubs.s
rename to modules/codec/loader/stubs.s

diff --git a/libs/loader/vfl.c b/modules/codec/loader/vfl.c
similarity index 100%
rename from libs/loader/vfl.c
rename to modules/codec/loader/vfl.c

diff --git a/libs/loader/win32.c b/modules/codec/loader/win32.c
similarity index 100%
rename from libs/loader/win32.c
rename to modules/codec/loader/win32.c

diff --git a/libs/loader/win32.h b/modules/codec/loader/win32.h
similarity index 100%
rename from libs/loader/win32.h
rename to modules/codec/loader/win32.h

diff --git a/libs/loader/wine/avifmt.h b/modules/codec/loader/wine/avifmt.h
similarity index 100%
rename from libs/loader/wine/avifmt.h
rename to modules/codec/loader/wine/avifmt.h

diff --git a/libs/loader/wine/basetsd.h b/modules/codec/loader/wine/basetsd.h
similarity index 100%
rename from libs/loader/wine/basetsd.h
rename to modules/codec/loader/wine/basetsd.h

diff --git a/libs/loader/wine/debugtools.h b/modules/codec/loader/wine/debugtools.h
similarity index 100%
rename from libs/loader/wine/debugtools.h
rename to modules/codec/loader/wine/debugtools.h

diff --git a/libs/loader/wine/driver.h b/modules/codec/loader/wine/driver.h
similarity index 100%
rename from libs/loader/wine/driver.h
rename to modules/codec/loader/wine/driver.h

diff --git a/libs/loader/wine/heap.h b/modules/codec/loader/wine/heap.h
similarity index 100%
rename from libs/loader/wine/heap.h
rename to modules/codec/loader/wine/heap.h

diff --git a/libs/loader/wine/mmreg.h b/modules/codec/loader/wine/mmreg.h
similarity index 100%
rename from libs/loader/wine/mmreg.h
rename to modules/codec/loader/wine/mmreg.h

diff --git a/libs/loader/wine/module.h b/modules/codec/loader/wine/module.h
similarity index 100%
rename from libs/loader/wine/module.h
rename to modules/codec/loader/wine/module.h

diff --git a/libs/loader/wine/msacm.h b/modules/codec/loader/wine/msacm.h
similarity index 100%
rename from libs/loader/wine/msacm.h
rename to modules/codec/loader/wine/msacm.h

diff --git a/libs/loader/wine/msacmdrv.h b/modules/codec/loader/wine/msacmdrv.h
similarity index 100%
rename from libs/loader/wine/msacmdrv.h
rename to modules/codec/loader/wine/msacmdrv.h

diff --git a/libs/loader/wine/pe_image.h b/modules/codec/loader/wine/pe_image.h
similarity index 100%
rename from libs/loader/wine/pe_image.h
rename to modules/codec/loader/wine/pe_image.h

diff --git a/libs/loader/wine/poppack.h b/modules/codec/loader/wine/poppack.h
similarity index 100%
rename from libs/loader/wine/poppack.h
rename to modules/codec/loader/wine/poppack.h

diff --git a/libs/loader/wine/pshpack1.h b/modules/codec/loader/wine/pshpack1.h
similarity index 100%
rename from libs/loader/wine/pshpack1.h
rename to modules/codec/loader/wine/pshpack1.h

diff --git a/libs/loader/wine/pshpack2.h b/modules/codec/loader/wine/pshpack2.h
similarity index 100%
rename from libs/loader/wine/pshpack2.h
rename to modules/codec/loader/wine/pshpack2.h

diff --git a/libs/loader/wine/vfw.h b/modules/codec/loader/wine/vfw.h
similarity index 100%
rename from libs/loader/wine/vfw.h
rename to modules/codec/loader/wine/vfw.h

diff --git a/libs/loader/wine/winbase.h b/modules/codec/loader/wine/winbase.h
similarity index 100%
rename from libs/loader/wine/winbase.h
rename to modules/codec/loader/wine/winbase.h

diff --git a/libs/loader/wine/windef.h b/modules/codec/loader/wine/windef.h
similarity index 100%
rename from libs/loader/wine/windef.h
rename to modules/codec/loader/wine/windef.h

diff --git a/libs/loader/wine/winerror.h b/modules/codec/loader/wine/winerror.h
similarity index 100%
rename from libs/loader/wine/winerror.h
rename to modules/codec/loader/wine/winerror.h

diff --git a/libs/loader/wine/winestring.h b/modules/codec/loader/wine/winestring.h
similarity index 100%
rename from libs/loader/wine/winestring.h
rename to modules/codec/loader/wine/winestring.h

diff --git a/libs/loader/wine/winnt.h b/modules/codec/loader/wine/winnt.h
similarity index 100%
rename from libs/loader/wine/winnt.h
rename to modules/codec/loader/wine/winnt.h

diff --git a/libs/loader/wine/winreg.h b/modules/codec/loader/wine/winreg.h
similarity index 100%
rename from libs/loader/wine/winreg.h
rename to modules/codec/loader/wine/winreg.h

diff --git a/libs/loader/wine/winuser.h b/modules/codec/loader/wine/winuser.h
similarity index 100%
rename from libs/loader/wine/winuser.h
rename to modules/codec/loader/wine/winuser.h

diff --git a/libs/loader/wineacm.h b/modules/codec/loader/wineacm.h
similarity index 100%
rename from libs/loader/wineacm.h
rename to modules/codec/loader/wineacm.h

diff --git a/libs/loader/wrapper.S b/modules/codec/loader/wrapper.S
similarity index 100%
rename from libs/loader/wrapper.S
rename to modules/codec/loader/wrapper.S

diff --git a/libs/loader/wrapper.h b/modules/codec/loader/wrapper.h
similarity index 100%
rename from libs/loader/wrapper.h
rename to modules/codec/loader/wrapper.h