X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=408352116ba610305064f38dfd152e1f679f3a0f;hb=6349569ec884998211024e3288b41ae3fa6adc6c;hp=b2a16ee5bec93ab255d2f9babcc6cccc8f5007f6;hpb=3e1fea390e453b25f50d1e4308b80a4a962b8564;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index b2a16ee5be..408352116b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,8 @@ NULL = EXTRA_DIST = extras/COPYING modules/builtin.h.in \ vlc-control.pc.in \ vlc-plugin.pc.in \ - libvlc.sym + libvlc.sym \ + libvlccore.sym BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) @@ -24,7 +25,6 @@ pluginsincludedir = $(pkgincludedir)/plugins pkginclude_HEADERS = \ ../include/vlc/vlc.h \ - ../include/vlc/common.h \ ../include/vlc/deprecated.h \ ../include/vlc/libvlc.h \ ../include/vlc/libvlc_structures.h \ @@ -36,70 +36,70 @@ pkginclude_HEADERS = \ $(NULL) pluginsinclude_HEADERS = \ - ../include/vlc_arrays.h \ - ../include/vlc_common.h \ - ../include/vlc_config.h \ - ../include/vlc_configuration.h \ - ../include/vlc_main.h \ - ../include/vlc_messages.h \ - ../include/vlc_modules.h \ - ../include/vlc_mtime.h \ - ../include/vlc_objects.h \ - ../include/vlc_plugin.h \ - ../include/vlc_threads.h \ - ../include/vlc_variables.h \ - $(NULL) - -noinst_HEADERS = \ - ../include/iso_lang.h \ - ../include/mmx.h \ ../include/vlc_access.h \ ../include/vlc_acl.h \ ../include/vlc_aout.h \ + ../include/vlc_arrays.h \ ../include/vlc_bits.h \ ../include/vlc_block.h \ ../include/vlc_block_helper.h \ ../include/vlc_charset.h \ ../include/vlc_codec.h \ - ../include/vlc_codec_synchro.h \ - ../include/vlc_codecs.h \ + ../include/vlc_common.h \ + ../include/vlc_config.h \ ../include/vlc_config_cat.h \ + ../include/vlc_configuration.h \ ../include/vlc_demux.h \ - ../include/vlc_devices.h \ ../include/vlc_epg.h \ ../include/vlc_es.h \ ../include/vlc_es_out.h \ ../include/vlc_events.h \ ../include/vlc_filter.h \ - ../include/vlc_fixups.h \ ../include/vlc_gcrypt.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ ../include/vlc_input.h \ - ../include/vlc_interface.h \ - ../include/vlc_intf_strings.h \ - ../include/vlc_keys.h \ + ../include/vlc_main.h \ ../include/vlc_md5.h \ + ../include/vlc_messages.h \ ../include/vlc_meta.h \ - ../include/vlc_network.h \ - ../include/vlc_osd.h \ - ../include/vlc_pgpkey.h \ + ../include/vlc_modules.h \ + ../include/vlc_mtime.h \ + ../include/vlc_objects.h \ ../include/vlc_playlist.h \ + ../include/vlc_plugin.h \ ../include/vlc_rand.h \ ../include/vlc_services_discovery.h \ ../include/vlc_sout.h \ ../include/vlc_stream.h \ - ../include/vlc_streaming.h \ ../include/vlc_strings.h \ - ../include/vlc_tls.h \ - ../include/vlc_update.h \ + ../include/vlc_threads.h \ ../include/vlc_url.h \ + ../include/vlc_variables.h \ ../include/vlc_vlm.h \ - ../include/vlc_vod.h \ ../include/vlc_vout.h \ ../include/vlc_xml.h \ $(NULL) +noinst_HEADERS = \ + ../include/mmx.h \ + ../include/vlc_codec_synchro.h \ + ../include/vlc_codecs.h \ + ../include/vlc_devices.h \ + ../include/vlc_fixups.h \ + ../include/vlc_interface.h \ + ../include/vlc_intf_strings.h \ + ../include/vlc_iso_lang.h \ + ../include/vlc_keys.h \ + ../include/vlc_network.h \ + ../include/vlc_osd.h \ + ../include/vlc_pgpkey.h \ + ../include/vlc_streaming.h \ + ../include/vlc_tls.h \ + ../include/vlc_update.h \ + ../include/vlc_vod.h \ + $(NULL) + modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am rm -f -- "$@.tmp" cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp" @@ -159,47 +159,40 @@ 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` \ +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_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 +libvlc_la_LDFLAGS = $(AM_LDFLAGS) \ + -version-info 2:0:0 \ + -export-symbols $(srcdir)/libvlc.sym +libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la -EXTRA_libvlc_la_SOURCES = \ +EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_linux) \ @@ -210,32 +203,34 @@ EXTRA_libvlc_la_SOURCES = \ $(SOURCES_libvlc_sout) \ $(NULL) if HAVE_BEOS -libvlc_la_SOURCES += $(SOURCES_libvlc_beos) +libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) else if HAVE_DARWIN -libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) +libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) else if HAVE_LINUX -libvlc_la_SOURCES += $(SOURCES_libvlc_linux) +libvlccore_la_SOURCES += $(SOURCES_libvlc_linux) else if HAVE_WIN32 -libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +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 = \ @@ -269,9 +264,9 @@ SOURCES_libvlc_getopt = \ SOURCES_libvlc_common = \ libvlc.c \ - libvlc-common.c \ libvlc.h \ libvlc-module.c \ + version.c \ interface/interface.h \ interface/interface.c \ interface/intf_eject.c \ @@ -350,6 +345,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 \ @@ -361,6 +357,7 @@ SOURCES_libvlc_common = \ misc/variables.h \ misc/variables.c \ misc/error.c \ + misc/variables.h \ misc/update.c \ misc/xml.c \ misc/devices.c \ @@ -369,6 +366,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 \ @@ -432,12 +430,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) @@ -464,6 +469,7 @@ endif # Unit/regression test ############################################################################### check_PROGRAMS = \ + test_block \ test_dictionary \ test_i18n_atof \ test_url \ @@ -476,20 +482,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 @@ -506,8 +516,7 @@ check-local: fi ; \ done $(srcdir)/check_headers $(pkginclude_HEADERS) -# Hmm, this test should not fail: - -$(srcdir)/check_headers $(pluginsinclude_HEADERS) + $(srcdir)/check_headers $(pluginsinclude_HEADERS) FORCE: @echo "Generated source cannot be phony. Go away." >&2