]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
-export-dynamic is no sense for libs, use -export-symbol (or nothing)
[vlc] / src / Makefile.am
diff --git a/src/Makefile.am b/src/Makefile.am
index 5c548227e1572f967989356f2c1769c02b043d1f..020a9b38f480cec2d867f76d9deceb74de4ea5a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
        vlc-control.pc.in \
        vlc-plugin.pc.in \
-       libvlc.sym
+       libvlccore.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
@@ -43,11 +43,10 @@ pluginsinclude_HEADERS = \
        ../include/vlc_main.h \
        ../include/vlc_messages.h \
        ../include/vlc_modules.h \
-       ../include/vlc_modules_macros.h \
        ../include/vlc_mtime.h \
        ../include/vlc_objects.h \
+       ../include/vlc_plugin.h \
        ../include/vlc_threads.h \
-       ../include/vlc_threads_funcs.h
        ../include/vlc_variables.h \
        $(NULL)
 
@@ -86,7 +85,6 @@ noinst_HEADERS = \
        ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
        ../include/vlc_playlist.h \
-       ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
        ../include/vlc_sout.h \
@@ -161,70 +159,77 @@ CLEANFILES += $(pkgconfig_DATA)
 nice:
        $(top_builddir)/compile
 
-lib_LTLIBRARIES = libvlc.la libvlc-control.la
+lib_LTLIBRARIES = libvlccore.la libvlc.la
 
 AM_LDFLAGS = -no-undefined -no-install
 if HAVE_WIN32
 AM_LDFLAGS += -avoid-version
 endif
 
-libvlc_la_SOURCES = $(SOURCES_libvlc)
-nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+libvlccore_la_SOURCES = $(SOURCES_libvlc)
+nodist_libvlccore_la_SOURCES = misc/revision.c
+libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
+       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(pkgdatadir)\" \
+       -DLIBDIR=\"$(libdir)\" \
        -DPLUGIN_PATH=\"$(pkglibdir)\"
-libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
-libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
-       -version-info 1:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_la_LDFLAGS += -export-dynamic
-else
-libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
-endif
-libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
-
-libvlc_la_DEPENDENCIES = libvlc.sym
-
-libvlc_control_la_SOURCES = $(SOURCES_libvlc_control)
-libvlc_control_la_LIBADD = libvlc.la
-libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
-libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_control_la_LDFLAGS += -export-dynamic
-else
-libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
-endif
+libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
+libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
+libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
+       -export-symbols $(srcdir)/libvlccore.sym \
+       -version-info 0:0:0
+libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
+libvlccore_la_DEPENDENCIES = libvlccore.sym
+
+libvlc_la_SOURCES = $(SOURCES_libvlc_control)
+libvlc_la_LIBADD = libvlccore.la
+libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"control\"
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+       -version-info 2:0:0 \
+       -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
 
-EXTRA_libvlc_la_SOURCES = \
+EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
+       $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
+       $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
        $(SOURCES_libvlc_sout) \
        $(NULL)
 if HAVE_BEOS
-libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_beos)
+else
 if HAVE_DARWIN
-libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin)
+else
+if HAVE_LINUX
+libvlccore_la_SOURCES += $(SOURCES_libvlc_linux)
+else
 if HAVE_WIN32
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-endif
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
 if HAVE_WINCE
-libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+libvlccore_la_SOURCES += $(SOURCES_libvlc_other)
+endif
+endif
+endif
+endif
 endif
 if BUILD_DIRENT
-libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent)
 endif
 if BUILD_GETOPT
-libvlc_la_SOURCES += $(SOURCES_libvlc_getopt)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
 if ENABLE_SOUT
-libvlc_la_SOURCES += $(SOURCES_libvlc_sout)
+libvlccore_la_SOURCES += $(SOURCES_libvlc_sout)
 endif
 
 SOURCES_libvlc_beos = \
@@ -235,11 +240,17 @@ SOURCES_libvlc_darwin = \
        misc/darwin_specific.c \
        $(NULL)
 
+SOURCES_libvlc_linux = \
+       misc/linux_specific.c \
+       $(NULL)
+
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
        network/winsock.c \
        $(NULL)
 
+SOURCES_libvlc_other = misc/not_specific.c
+
 SOURCES_libvlc_dirent = \
        extras/dirent.c \
        $(NULL)
@@ -333,6 +344,7 @@ SOURCES_libvlc_common = \
        misc/action.c \
        config/configuration.h \
        config/core.c \
+       config/dirs.c \
        config/chain.c \
        config/file.c \
        config/intf.c \
@@ -352,6 +364,7 @@ SOURCES_libvlc_common = \
 
 SOURCES_libvlc_sout = \
        input/vlm.c \
+       input/vlmshell.c \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
        stream_output/announce.c \
@@ -415,12 +428,19 @@ if BUILD_VLC
 bin_PROGRAMS = vlc
 endif
 
+if !HAVE_WIN32
 vlc_SOURCES = vlc.c
+else
+vlc_SOURCES = winvlc.c
+endif
+
 vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
-vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+# vlc needs libvlccore for locale conversion
+vlc_LDADD = $(DATA_win32_rc) libvlc.la libvlccore.la $(LTLIBINTL) \
+       `$(VLC_CONFIG) -libs vlc`
 
 if BUILD_VLC
 vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@@ -447,6 +467,7 @@ endif
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
+       test_block \
        test_dictionary \
        test_i18n_atof \
        test_url \
@@ -459,20 +480,24 @@ TESTS = $(check_PROGRAMS) check_symbols
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
+test_block_SOURCES = test/block.c
+test_block_LDADD = libvlccore.la
+test_block_CFLAGS = $(CFLAGS_tests)
+
 test_dictionary_SOURCES = test/dictionary.c
-test_dictionary_LDADD = libvlc.la
+test_dictionary_LDADD = libvlccore.la
 test_dictionary_CFLAGS = $(CFLAGS_tests)
 
 test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c
-test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_LDADD = libvlccore.la
 test_i18n_atof_CFLAGS = $(CFLAGS_tests)
 
 test_url_SOURCES = test/url.c
-test_url_LDADD = libvlc.la
+test_url_LDADD = libvlccore.la
 test_url_CFLAGS = $(CFLAGS_tests)
 
 test_utf8_SOURCES = test/utf8.c
-test_utf8_LDADD = libvlc.la
+test_utf8_LDADD = libvlccore.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
 
 test_headers_SOURCES = test/headers.c
Unnamed repository; edit this file 'description' to name the repository.