Commit 066e58dd authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Create a modules-like directory for libraries

that are not plugins neither in the core
parent 6386b464
...@@ -12,7 +12,7 @@ NULL = ...@@ -12,7 +12,7 @@ NULL =
# - . should come before mozilla/bindings because the plugin needs libvlc.a # - . should come before mozilla/bindings because the plugin needs libvlc.a
# - po should come before . because VLC.app needs the pofiles # - po should come before . because VLC.app needs the pofiles
# - loader should come before modules because some plugins need it # - 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 DIST_SUBDIRS = $(SUBDIRS) ipkg
EXTRA_DIST = \ EXTRA_DIST = \
......
...@@ -5304,12 +5304,12 @@ AC_ARG_ENABLE(loader, ...@@ -5304,12 +5304,12 @@ AC_ARG_ENABLE(loader,
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"], AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGINS([dmo]) [ VLC_ADD_PLUGINS([dmo])
VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/loader]) VLC_ADD_CPPFLAGS([dmo],[-I../../../@top_srcdir@/libs/loader])
VLC_ADD_LDFLAGS([dmo],[../../../loader/libloader.la -lpthread]) VLC_ADD_LDFLAGS([dmo],[../../../libs/loader/libloader.la -lpthread])
VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/loader]) VLC_ADD_CPPFLAGS([quicktime],[-I../../@top_srcdir@/libs/loader])
VLC_ADD_LDFLAGS([quicktime],[../../loader/libloader.la -lpthread]) VLC_ADD_LDFLAGS([quicktime],[../../libs/loader/libloader.la -lpthread])
VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/loader -DLOADER]) VLC_ADD_CPPFLAGS([realaudio],[-I../../@top_srcdir@/libs/loader -DLOADER])
VLC_ADD_LDFLAGS([realaudio],[../../loader/libloader.la -ldl -lpthread]) VLC_ADD_LDFLAGS([realaudio],[../../libs/loader/libloader.la -ldl -lpthread])
]) ])
dnl dnl
...@@ -5771,7 +5771,8 @@ AC_CONFIG_FILES([ ...@@ -5771,7 +5771,8 @@ AC_CONFIG_FILES([
doc/Makefile doc/Makefile
intl/Makefile intl/Makefile
ipkg/Makefile ipkg/Makefile
loader/Makefile libs/Makefile
libs/loader/Makefile
modules/Makefile modules/Makefile
mozilla/Makefile mozilla/Makefile
m4/Makefile m4/Makefile
......
SUBDIRS = loader
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment