Only compile the winsock stubs file on Win32

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 5f474be453c86e750188e41cc513a6fa3b773954..c866633e260661711cfe2969935b990ec13a9534 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,8 +20,9 @@ SUFFIXES = .pc.in .pc
 ###############################################################################
 
 pkgincludedir = $(includedir)/vlc
+pluginsincludedir = $(pkgincludedir)/plugins
 
-dist_pkginclude_HEADERS = \
+pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
        ../include/vlc/common.h \
        ../include/vlc/deprecated.h \
@@ -34,16 +35,28 @@ dist_pkginclude_HEADERS = \
        ../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 \
@@ -51,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 \
@@ -70,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 \
@@ -87,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 \
@@ -200,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)
@@ -219,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 \
@@ -230,6 +236,7 @@ SOURCES_libvlc_darwin = \
 
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
+       network/winsock.c \
        $(NULL)
 
 SOURCES_libvlc_dirent = \
@@ -292,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 \
@@ -344,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) \
@@ -442,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`
 
@@ -469,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 ; \
@@ -483,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