X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=69a516007564a4c833996d43efac5a97477f4a3e;hb=8fa5e87a74c09da620b64717f1a3a535fadd9d7d;hp=97520eaf6ab4c87a0eee912fd4cd99913426d849;hpb=88a2f3ed297cc89eb4f13e1ec4c673c04fdf5f29;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index 97520eaf6a..69a5160075 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,6 +3,7 @@ ############################################################################### AUTOMAKE_OPTIONS = subdir-objects +SUBDIRS = . test NULL = EXTRA_DIST = extras/COPYING modules/builtin.h.in \ @@ -96,7 +97,6 @@ noinst_HEADERS = \ ../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 \ @@ -163,7 +163,7 @@ nice: lib_LTLIBRARIES = libvlccore.la libvlc.la -AM_LDFLAGS = -no-undefined -no-install +AM_LDFLAGS = -no-undefined if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif @@ -179,18 +179,30 @@ libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ -DPLUGIN_PATH=\"$(pkglibdir)\" libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ -export-symbols $(srcdir)/libvlccore.sym \ - -version-info 0:1:0 + -version-info 1:0:0 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) libvlccore_la_DEPENDENCIES = libvlccore.sym +if HAVE_WIN32 +libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) +libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) +endif + +libvlc_win32_rc.$(OBJEXT): $(top_builddir)/share/libvlc_win32_rc.rc + $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ 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:1:0 \ + -version-info 2:2:0 \ -export-symbols $(srcdir)/libvlc.sym libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la +if HAVE_WIN32 +libvlc_la_DEPENDENCIES += $(DATA_win32_rc_lib) +libvlc_la_LDFLAGS += -Wl,$(DATA_win32_rc_lib) +endif + EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_beos) \ @@ -201,6 +213,7 @@ EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_dirent) \ $(SOURCES_libvlc_getopt) \ $(SOURCES_libvlc_sout) \ + $(SOURCES_libvlc_vlm) \ $(NULL) if HAVE_BEOS libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) @@ -231,6 +244,9 @@ libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt) endif if ENABLE_SOUT libvlccore_la_SOURCES += $(SOURCES_libvlc_sout) +if ENABLE_VLM +libvlccore_la_SOURCES += $(SOURCES_libvlc_vlm) +endif endif SOURCES_libvlc_beos = \ @@ -333,6 +349,7 @@ SOURCES_libvlc_common = \ misc/rand.c \ misc/mtime.c \ misc/block.c \ + misc/es_format.c \ modules/modules.h \ modules/modules.c \ modules/cache.c \ @@ -365,16 +382,18 @@ SOURCES_libvlc_common = \ $(NULL) SOURCES_libvlc_sout = \ - input/vlm.c \ - input/vlmshell.c \ stream_output/stream_output.c \ stream_output/stream_output.h \ stream_output/announce.c \ - stream_output/profiles.c \ stream_output/sap.c \ stream_output/sdp.c \ $(NULL) +SOURCES_libvlc_vlm = \ + input/vlm.c \ + input/vlmshell.c \ + $(NULL) + SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ $(OPT_SOURCES_libvlc_beos) \ @@ -422,94 +441,12 @@ misc/revision.c: mv -f $@.tmp $@ -############################################################################### -# Building vlc -############################################################################### - -EXTRA_PROGRAMS = vlc vlc-wrapper -if BUILD_VLC -bin_PROGRAMS = vlc -if !HAVE_WIN32 -bin_PROGRAMS += vlc-wrapper -endif -endif - -EXTRA_vlc_SOURCES = vlc.c winvlc.c -if !HAVE_WIN32 -vlc_SOURCES = vlc.c -else -vlc_SOURCES = winvlc.c -endif -vlc_wrapper_SOURCES = network/rootwrap.c - -vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la - -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags 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) - @rm -f vlc$(EXEEXT) - @case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) cmd="$(CXXLINK)" ;; \ - objc) cmd="$(OBJCLINK)" ;; \ - c|*) cmd="$(LINK)" ;; \ - esac ; \ - cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ - echo $$cmd ; \ - eval $$cmd - -if HAVE_WIN32 -DATA_win32_rc = $(noinst_DATA) -noinst_DATA = vlc_win32_rc.$(OBJEXT) - -vlc_win32_rc.$(OBJEXT): $(top_srcdir)/share/vlc_win32_rc.rc - $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(top_srcdir)/share -i $< -o $@ -endif -endif - ############################################################################### # Unit/regression test ############################################################################### -check_PROGRAMS = \ - test_block \ - test_dictionary \ - test_i18n_atof \ - test_url \ - test_utf8 \ - test_headers \ - $(NULL) dist_check_SCRIPTS = check_symbols check_headers -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 = libvlccore.la -test_dictionary_CFLAGS = $(CFLAGS_tests) - -test_i18n_atof_SOURCES = test/i18n_atof.c text/charset.c -test_i18n_atof_LDADD = libvlccore.la -test_i18n_atof_CFLAGS = $(CFLAGS_tests) - -test_url_SOURCES = test/url.c -test_url_LDADD = libvlccore.la -test_url_CFLAGS = $(CFLAGS_tests) - -test_utf8_SOURCES = test/utf8.c -test_utf8_LDADD = libvlccore.la -test_utf8_CFLAGS = $(CFLAGS_tests) - -test_headers_SOURCES = test/headers.c -test_headers_CFLAGS = $(CFLAGS_tests) +TESTS = check_symbols check-local: for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \