X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FMakefile.am;h=a7ec95658eac0502123d13648f2b7d7ef30f0d5b;hb=97d1d1c21efde89b1ce9c5e1c89e171b09d33aa1;hp=d35d643fecd389a36d04ebe051e6494808178807;hpb=53e6603735235bdc574a4d0d6a6c9450f7e3af84;p=vlc diff --git a/src/Makefile.am b/src/Makefile.am index d35d643fec..a7ec95658e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -5,11 +5,13 @@ AUTOMAKE_OPTIONS = subdir-objects NULL = -EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym +EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in -BUILT_SOURCES = modules/builtin.h misc/revision.c +BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) +SUFFIXES = .pc.in .pc + ############################################################################### # Headers ############################################################################### @@ -52,6 +54,7 @@ HEADERS_include = \ ../include/vlc_es_out.h \ ../include/vlc_events.h \ ../include/vlc_filter.h \ + ../include/vlc_fixups.h \ ../include/vlc_httpd.h \ ../include/vlc_image.h \ ../include/vlc_input.h \ @@ -66,9 +69,10 @@ HEADERS_include = \ ../include/vlc_mtime.h \ ../include/vlc_network.h \ ../include/vlc_objects.h \ - ../include/vlc_os_specific.h \ ../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 \ @@ -112,6 +116,33 @@ endif modules/modules.c: modules/builtin.h +../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS + rm -f -- "$@.tmp" + mkdir -p -- ../include + echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp" + echo "static const char psz_license[] =" >> "$@.tmp" + cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_thanks[] =" >> "$@.tmp" + grep -v '$$Id:' $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp" + echo ";" >> "$@.tmp" + echo "static const char psz_authors[] =" >> "$@.tmp" + grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp" + echo ";" >> "$@.tmp" + mv -f -- "$@.tmp" "$@" + +############################################################################### +# pkg-config integration +############################################################################### + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = vlc-control.pc vlc-plugin.pc +CLEANFILES += $(pkgconfig_DATA) + +.pc.in.pc: $(top_builddir)/config.status + cd "$(top_builddir)" && \ + $(SHELL) ./config.status --file="src/$@" + ############################################################################### # Building libvlc ############################################################################### @@ -128,7 +159,10 @@ endif libvlc_la_SOURCES = $(SOURCES_libvlc) nodist_libvlc_la_SOURCES = misc/revision.c -libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` +libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ + -DLOCALEDIR=\"$(localedir)\" \ + -DDATA_PATH=\"$(pkgdatadir)\" \ + -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) \ @@ -145,7 +179,7 @@ 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 0:0:0 +libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 if HAVE_COMPILER_EXPORT libvlc_control_la_LDFLAGS += -export-dynamic else @@ -205,7 +239,6 @@ SOURCES_libvlc_common = \ libvlc-common.c \ libvlc.h \ libvlc-module.c \ - interface/interface.h \ interface/interface.c \ interface/intf_eject.c \ interface/interaction.c \ @@ -257,7 +290,6 @@ SOURCES_libvlc_common = \ stream_output/sap.c \ stream_output/sdp.c \ osd/osd.c \ - osd/osd_parser.c \ osd/osd_text.c \ osd/osd_widgets.c \ network/acl.c \ @@ -282,13 +314,18 @@ SOURCES_libvlc_common = \ misc/block.c \ modules/modules.h \ modules/modules.c \ + modules/cache.c \ modules/entry.c \ + modules/os.c \ misc/threads.c \ misc/stats.c \ misc/cpu.c \ - modules/configuration.h \ - modules/configuration.c \ - modules/configuration_chain.c \ + config/configuration.h \ + config/core.c \ + config/chain.c \ + config/file.c \ + config/intf.c \ + config/cmdline.c \ misc/events.c \ misc/image.c \ misc/messages.c \ @@ -322,7 +359,9 @@ SOURCES_libvlc_control = \ control/audio.c \ control/dynamic_media_list.c \ control/event.c \ - control/flat_media_list.c \ + control/flat_media_list_view.c \ + control/hierarchical_media_list_view.c \ + control/hierarchical_node_media_list_view.c \ control/media_descriptor.c \ control/media_instance.c \ control/media_list.c \ @@ -344,19 +383,70 @@ SOURCES_libvlc_control = \ misc/revision.c: rm -f $@ $@.tmp echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp - REVISION="$$(LANG=C svnversion "$(top_srcdir)" 2>/dev/null || echo exported)" ; \ + REVISION="$$((LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported) | cut -b -10)"; \ echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp mv -f $@.tmp $@ + +############################################################################### +# Building vlc +############################################################################### + +if BUILD_VLC +bin_PROGRAMS = vlc +endif + +vlc_SOURCES = vlc.c +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` + +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_i18n_atof test_url test_utf8 -TESTS = $(check_PROGRAMS) +check_PROGRAMS = \ + test_dictionary \ + test_i18n_atof \ + test_url \ + test_utf8 \ + test_headers \ + test_control \ + $(NULL) + +dist_check_SCRIPTS = check_symbols +TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS) CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc` +test_dictionary_SOURCES = test/dictionary.c +test_dictionary_LDADD = libvlc.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_CFLAGS = $(CFLAGS_tests) test_url_SOURCES = test/url.c @@ -367,6 +457,24 @@ test_utf8_SOURCES = test/utf8.c test_utf8_LDADD = libvlc.la test_utf8_CFLAGS = $(CFLAGS_tests) +test_headers_SOURCES = test/headers.c +test_headers_CFLAGS = $(CFLAGS_tests) + +test_control_SOURCES = control/testapi.c +test_control_LDADD = libvlc-control.la +test_control_CFLAGS = $(CFLAGS_tests) + +check-local: + for h in `echo $(dist_pkginclude_HEADERS) $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \ + do \ + echo grep - "#include <$$h>" $(srcdir)/test/headers.c ; \ + if ! grep -- "#include <$$h>" $(srcdir)/test/headers.c ; \ + then \ + echo "Header $$h not included in test/headers.c!"; \ + exit 1; \ + fi ; \ + done + FORCE: @echo "Generated source cannot be phony. Go away." >&2 @exit 1