]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
Only compile the winsock stubs file on Win32
[vlc] / src / Makefile.am
index dae043efb6aff4fcb2097320f8713b7822c05e1b..c866633e260661711cfe2969935b990ec13a9534 100644 (file)
@@ -5,35 +5,58 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
-EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym vlc-control.pc.in
+EXTRA_DIST = extras/COPYING modules/builtin.h.in \
+       vlc-control.pc.in \
+       vlc-plugin.pc.in \
+       libvlc.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
+SUFFIXES = .pc.in .pc
+
 ###############################################################################
 # Headers
 ###############################################################################
 
 pkgincludedir = $(includedir)/vlc
+pluginsincludedir = $(pkgincludedir)/plugins
 
-dist_pkginclude_HEADERS = \
+pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
+       ../include/vlc/common.h \
+       ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
        ../include/vlc/libvlc_structures.h \
+       ../include/vlc/libvlc_media_list.h \
+       ../include/vlc/libvlc_events.h \
+       ../include/vlc/libvlc_vlm.h \
        ../include/vlc/mediacontrol.h \
        ../include/vlc/mediacontrol_structures.h \
        $(NULL)
 
-noinst_HEADERS = $(HEADERS_include)
+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_modules_macros.h \
+       ../include/vlc_mtime.h \
+       ../include/vlc_objects.h \
+       ../include/vlc_threads.h \
+       ../include/vlc_threads_funcs.h
+       ../include/vlc_variables.h \
+       $(NULL)
 
-HEADERS_include = \
+noinst_HEADERS = \
        ../include/iso_lang.h \
-       ../include/main.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 \
@@ -41,10 +64,7 @@ HEADERS_include = \
        ../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 \
@@ -60,13 +80,8 @@ HEADERS_include = \
        ../include/vlc_intf_strings.h \
        ../include/vlc_keys.h \
        ../include/vlc_md5.h \
-       ../include/vlc_messages.h \
        ../include/vlc_meta.h \
-       ../include/vlc_modules.h \
-       ../include/vlc_modules_macros.h \
-       ../include/vlc_mtime.h \
        ../include/vlc_network.h \
-       ../include/vlc_objects.h \
        ../include/vlc_osd.h \
        ../include/vlc_pgpkey.h \
        ../include/vlc_playlist.h \
@@ -77,12 +92,9 @@ HEADERS_include = \
        ../include/vlc_stream.h \
        ../include/vlc_streaming.h \
        ../include/vlc_strings.h \
-       ../include/vlc_threads.h \
-       ../include/vlc_threads_funcs.h \
        ../include/vlc_tls.h \
        ../include/vlc_update.h \
        ../include/vlc_url.h \
-       ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
        ../include/vlc_vod.h \
        ../include/vlc_vout.h \
@@ -134,12 +146,12 @@ modules/modules.c: modules/builtin.h
 ###############################################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc
+pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
 CLEANFILES += $(pkgconfig_DATA)
 
-vlc-control.pc: vlc-control.pc.in $(top_builddir)/config.status
-       cd $(top_builddir) && \
-       $(SHELL) ./config.status --file=src/vlc-control.pc
+.pc.in.pc: $(top_builddir)/config.status
+       cd "$(top_builddir)" && \
+       $(SHELL) ./config.status --file="src/$@"
 
 ###############################################################################
 # Building libvlc
@@ -158,7 +170,9 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
-       -DDATA_PATH=\"$(pkgdatadir)\"
+       -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) \
@@ -188,6 +202,7 @@ EXTRA_libvlc_la_SOURCES = \
        $(SOURCES_libvlc_win32) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
+       $(SOURCES_libvlc_sout) \
        $(NULL)
 if HAVE_BEOS
 libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
@@ -207,6 +222,9 @@ endif
 if BUILD_GETOPT
 libvlc_la_SOURCES += $(SOURCES_libvlc_getopt)
 endif
+if ENABLE_SOUT
+libvlc_la_SOURCES += $(SOURCES_libvlc_sout)
+endif
 
 SOURCES_libvlc_beos = \
        misc/beos_specific.cpp \
@@ -218,6 +236,7 @@ SOURCES_libvlc_darwin = \
 
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
+       network/winsock.c \
        $(NULL)
 
 SOURCES_libvlc_dirent = \
@@ -235,6 +254,7 @@ SOURCES_libvlc_common = \
        libvlc-common.c \
        libvlc.h \
        libvlc-module.c \
+       interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
        interface/interaction.c \
@@ -279,19 +299,12 @@ SOURCES_libvlc_common = \
        audio_output/mixer.c \
        audio_output/output.c \
        audio_output/intf.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 \
        osd/osd.c \
        osd/osd_text.c \
        osd/osd_widgets.c \
        network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
-       network/error.c \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \
@@ -316,6 +329,7 @@ SOURCES_libvlc_common = \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
+       misc/action.c \
        config/configuration.h \
        config/core.c \
        config/chain.c \
@@ -330,12 +344,21 @@ SOURCES_libvlc_common = \
        misc/variables.c \
        misc/error.c \
        misc/update.c \
-       input/vlm.c \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
        $(NULL)
 
+SOURCES_libvlc_sout = \
+       input/vlm.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 = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -353,13 +376,12 @@ SOURCES_libvlc_control = \
        control/vlm.c \
        control/video.c \
        control/audio.c \
-       control/dynamic_media_list.c \
        control/event.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.c \
+       control/media_player.c \
        control/media_list.c \
        control/media_list_path.h \
        control/media_list_player.c \
@@ -369,8 +391,7 @@ SOURCES_libvlc_control = \
        control/mediacontrol_core.c \
        control/mediacontrol_util.c \
        control/mediacontrol_audio_video.c \
-       control/media_discoverer.c \
-       control/tag_query.c
+       control/media_discoverer.c
 
 ###############################################################################
 # Stamp rules
@@ -379,7 +400,8 @@ SOURCES_libvlc_control = \
 misc/revision.c:
        rm -f $@ $@.tmp
        echo "/* AUTOGENERATED FILE - DO NOT EDIT */" > $@.tmp
-       REVISION="$$((LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported) | cut -b -10)"; \
+       REVISION="$$(LANG=C git --git-dir=$(top_srcdir)/.git show-ref -s HEAD 2>/dev/null || echo exported)"; \
+       REVISION="$$(echo $$REVISION|cut -b -10)"; \
        echo "const char psz_vlc_changeset[] = \"$$REVISION\";" >> $@.tmp
        mv -f $@.tmp $@
 
@@ -388,8 +410,10 @@ misc/revision.c:
 # Building vlc
 ###############################################################################
 
+if BUILD_VLC
 bin_PROGRAMS = vlc
-# 
+endif
+
 vlc_SOURCES = vlc.c
 vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la
 
@@ -397,6 +421,7 @@ 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 \
@@ -415,6 +440,7 @@ 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
@@ -425,11 +451,10 @@ check_PROGRAMS = \
        test_url \
        test_utf8 \
        test_headers \
-       test_control \
        $(NULL)
 
-dist_check_SCRIPTS = check_symbols
-TESTS = $(check_PROGRAMS) $(dist_check_SCRIPTS)
+dist_check_SCRIPTS = check_symbols check_headers
+TESTS = $(check_PROGRAMS) check_symbols
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
 
@@ -452,12 +477,8 @@ 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`; \
+       for h in `echo $(pkginclude_HEADERS) | sed -e s,\.\./include/,,g`; \
        do \
                echo grep - "#include <$$h>" $(srcdir)/test/headers.c ; \
                if ! grep -- "#include <$$h>" $(srcdir)/test/headers.c ; \
@@ -466,6 +487,9 @@ check-local:
                        exit 1; \
                fi ; \
        done
+       $(srcdir)/check_headers $(pkginclude_HEADERS)
+# Hmm, this test should not fail:
+       -$(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
        @echo "Generated source cannot be phony. Go away." >&2