]> git.sesse.net Git - vlc/blobdiff - src/Makefile.am
Remove unused variable.
[vlc] / src / Makefile.am
index b9386416e53af0f4f161b99bfec9fc0f60e9192e..319666f126440ff2be595cbef10ac3b4e27df8e9 100644 (file)
@@ -6,8 +6,9 @@ AUTOMAKE_OPTIONS = subdir-objects
 
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in \
-       vlc-control.pc.in \
+       libvlc.pc.in \
        vlc-plugin.pc.in \
+       libvlc.sym \
        libvlccore.sym
 
 BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
@@ -24,7 +25,6 @@ pluginsincludedir = $(pkgincludedir)/plugins
 
 pkginclude_HEADERS = \
        ../include/vlc/vlc.h \
-       ../include/vlc/common.h \
        ../include/vlc/deprecated.h \
        ../include/vlc/libvlc.h \
        ../include/vlc/libvlc_structures.h \
@@ -36,70 +36,70 @@ pkginclude_HEADERS = \
        $(NULL)
 
 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_mtime.h \
-       ../include/vlc_objects.h \
-       ../include/vlc_plugin.h \
-       ../include/vlc_threads.h \
-       ../include/vlc_variables.h \
-       $(NULL)
-
-noinst_HEADERS = \
-       ../include/iso_lang.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 \
        ../include/vlc_charset.h \
        ../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 \
        ../include/vlc_es.h \
        ../include/vlc_es_out.h \
        ../include/vlc_events.h \
        ../include/vlc_filter.h \
-       ../include/vlc_fixups.h \
        ../include/vlc_gcrypt.h \
        ../include/vlc_httpd.h \
        ../include/vlc_image.h \
        ../include/vlc_input.h \
-       ../include/vlc_interface.h \
-       ../include/vlc_intf_strings.h \
-       ../include/vlc_keys.h \
+       ../include/vlc_main.h \
        ../include/vlc_md5.h \
+       ../include/vlc_messages.h \
        ../include/vlc_meta.h \
-       ../include/vlc_network.h \
-       ../include/vlc_osd.h \
-       ../include/vlc_pgpkey.h \
+       ../include/vlc_modules.h \
+       ../include/vlc_mtime.h \
+       ../include/vlc_objects.h \
        ../include/vlc_playlist.h \
+       ../include/vlc_plugin.h \
        ../include/vlc_rand.h \
        ../include/vlc_services_discovery.h \
        ../include/vlc_sout.h \
        ../include/vlc_stream.h \
-       ../include/vlc_streaming.h \
        ../include/vlc_strings.h \
-       ../include/vlc_tls.h \
-       ../include/vlc_update.h \
+       ../include/vlc_threads.h \
        ../include/vlc_url.h \
+       ../include/vlc_variables.h \
        ../include/vlc_vlm.h \
-       ../include/vlc_vod.h \
        ../include/vlc_vout.h \
        ../include/vlc_xml.h \
        $(NULL)
 
+noinst_HEADERS = \
+       ../include/mmx.h \
+       ../include/vlc_codec_synchro.h \
+       ../include/vlc_codecs.h \
+       ../include/vlc_devices.h \
+       ../include/vlc_fixups.h \
+       ../include/vlc_interface.h \
+       ../include/vlc_intf_strings.h \
+       ../include/vlc_iso_lang.h \
+       ../include/vlc_keys.h \
+       ../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 \
+       $(NULL)
+
 modules/builtin.h: modules/builtin.h.in ../vlc-config Makefile.am
        rm -f -- "$@.tmp"
        cat "$(srcdir)/modules/builtin.h.in" > "$@.tmp"
@@ -145,7 +145,7 @@ modules/modules.c: modules/builtin.h
 ###############################################################################
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vlc-control.pc vlc-plugin.pc
+pkgconfig_DATA = libvlc.pc vlc-plugin.pc
 CLEANFILES += $(pkgconfig_DATA)
 
 .pc.in.pc: $(top_builddir)/config.status
@@ -178,12 +178,8 @@ libvlccore_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
-if HAVE_COMPILER_EXPORT
-libvlccore_la_LDFLAGS += -export-dynamic
-else
-libvlccore_la_LDFLAGS += -export-symbols $(srcdir)/libvlccore.sym 
-endif
 libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 libvlccore_la_DEPENDENCIES = libvlccore.sym
 
@@ -191,12 +187,10 @@ 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:0:0
-if HAVE_COMPILER_EXPORT
-libvlc_la_LDFLAGS += -export-dynamic
-else
-libvlc_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*'
-endif
+libvlc_la_LDFLAGS = $(AM_LDFLAGS) \
+       -version-info 2:0:0 \
+       -export-symbols $(srcdir)/libvlc.sym
+libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la
 
 EXTRA_libvlccore_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
@@ -270,9 +264,9 @@ SOURCES_libvlc_getopt = \
 
 SOURCES_libvlc_common = \
        libvlc.c \
-       libvlc-common.c \
        libvlc.h \
        libvlc-module.c \
+       version.c \
        interface/interface.h \
        interface/interface.c \
        interface/intf_eject.c \
@@ -327,7 +321,7 @@ SOURCES_libvlc_common = \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \
-       network/rootwrap.c \
+       network/rootbind.c \
        network/tls.c \
        network/poll.c \
        text/charset.c \
@@ -363,10 +357,12 @@ SOURCES_libvlc_common = \
        misc/variables.h \
        misc/variables.c \
        misc/error.c \
+       misc/update.h \
        misc/update.c \
        misc/xml.c \
        misc/devices.c \
        extras/libc.c \
+       misc/filter_chain.c \
        $(NULL)
 
 SOURCES_libvlc_sout = \
@@ -431,11 +427,22 @@ misc/revision.c:
 # 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`
@@ -516,8 +523,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