Create a modules-like directory for libraries

that are not plugins neither in the core

diff --git a/Makefile.am b/Makefile.am
index 5ed349ea29c739477f3ba28d20b783e6d626fb52..5790052068d97cabce610aa9944ef5daddc64c23 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ NULL =
 #  - . should come before mozilla/bindings because the plugin needs libvlc.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
-SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
+SUBDIRS = intl libs src modules po . mozilla bindings activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS)  ipkg
 
 EXTRA_DIST = \

diff --git a/configure.ac b/configure.ac
index c36104cbdda79c636272788dbe2037a59029e8f9..69bd5c91d37944cb236760eadf4f867e5431aefe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5304,12 +5304,12 @@ AC_ARG_ENABLE(loader,
 AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
 AS_IF([test "${enable_loader}" = "yes"],
   [ VLC_ADD_PLUGINS([dmo])
-    VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader])
-    VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la -lpthread])
-    VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader])
-    VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la -lpthread])
-    VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER])
-    VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la -ldl -lpthread])
+    VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader])
+    VLC_ADD_LDFLAGS([dmo],[../../../libs/loader/libloader.la -lpthread])
+    VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
+    VLC_ADD_LDFLAGS([quicktime],[../../libs/loader/libloader.la -lpthread])
+    VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
+    VLC_ADD_LDFLAGS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread])
   ])
 
 dnl
@@ -5771,7 +5771,8 @@ AC_CONFIG_FILES([
   doc/Makefile
   intl/Makefile
   ipkg/Makefile
-  loader/Makefile
+  libs/Makefile
+  libs/loader/Makefile
   modules/Makefile
   mozilla/Makefile
   m4/Makefile

diff --git a/libs/Makefile.am b/libs/Makefile.am
new file mode 100644 (file)
index 0000000..d889c23
--- /dev/null
+++ b/libs/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = loader
+

diff --git a/loader/Makefile.am b/libs/loader/Makefile.am
similarity index 100%
rename from loader/Makefile.am
rename to libs/loader/Makefile.am

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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