X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=de41e13f7a7c72cef970aff5938e7518a09847b5;hb=3b9c8273f54c0a16cab11d032e11d324930c6ab6;hp=a01b510e434d66b22d5b05c570020071f84bdf68;hpb=862c17fa7fe53fe962ccbd20238ea8ecc774c4fc;p=vlc

diff --git a/src/Makefile.am b/src/Makefile.am
index a01b510e43..de41e13f7a 100644
--- 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)
@@ -159,47 +159,39 @@ 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-regex '^_?(libvlc|mediacontrol)_.*'
 
-EXTRA_libvlc_la_SOURCES = \
+EXTRA_libvlccore_la_SOURCES = \
 	$(SOURCES_libvlc_beos) \
 	$(SOURCES_libvlc_darwin) \
 	$(SOURCES_libvlc_linux) \
@@ -210,34 +202,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
-libvlc_la_SOURCES += $(SOURCES_libvlc_other)
+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 = \
@@ -352,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 \
@@ -371,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 \
@@ -434,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)
@@ -466,6 +467,7 @@ endif
 # Unit/regression test
 ###############################################################################
 check_PROGRAMS = \
+	test_block \
 	test_dictionary \
 	test_i18n_atof \
 	test_url \
@@ -478,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
@@ -508,8 +514,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