Get rid of b_attached

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 16c961172a988143b4898d7e3fccd18d55f7a000..aefa6ce3c62ffea47b7ba8b271368eba4cbc91e3 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,27 @@ 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_mtime.h \
+       ../include/vlc_objects.h \
+       ../include/vlc_plugin.h \
+       ../include/vlc_threads.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 +63,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 \
@@ -63,6 +72,7 @@ HEADERS_include = \
        ../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 \
@@ -70,29 +80,20 @@ 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 \
-       ../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_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 \
@@ -168,8 +169,11 @@ endif
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"main\" \
        -DLOCALEDIR=\"$(localedir)\" \
+       -DSYSCONFDIR=\"$(sysconfdir)\" \
        -DDATA_PATH=\"$(pkgdatadir)\" \
+       -DLIBDIR=\"$(libdir)\" \
        -DPLUGIN_PATH=\"$(pkglibdir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
@@ -186,7 +190,8 @@ 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_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \
+       -DMODULE_STRING=\"control\"
 libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic
@@ -197,22 +202,33 @@ endif
 EXTRA_libvlc_la_SOURCES = \
        $(SOURCES_libvlc_beos) \
        $(SOURCES_libvlc_darwin) \
+       $(SOURCES_libvlc_linux) \
        $(SOURCES_libvlc_win32) \
+       $(SOURCES_libvlc_other) \
        $(SOURCES_libvlc_dirent) \
        $(SOURCES_libvlc_getopt) \
        $(SOURCES_libvlc_sout) \
        $(NULL)
 if HAVE_BEOS
 libvlc_la_SOURCES += $(SOURCES_libvlc_beos)
-endif
+else
 if HAVE_DARWIN
 libvlc_la_SOURCES += $(SOURCES_libvlc_darwin)
-endif
+else
+if HAVE_LINUX
+libvlc_la_SOURCES += $(SOURCES_libvlc_linux)
+else
 if HAVE_WIN32
 libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
-endif
+else
 if HAVE_WINCE
 libvlc_la_SOURCES += $(SOURCES_libvlc_win32)
+else
+libvlc_la_SOURCES += $(SOURCES_libvlc_other)
+endif
+endif
+endif
+endif
 endif
 if BUILD_DIRENT
 libvlc_la_SOURCES += $(SOURCES_libvlc_dirent)
@@ -232,10 +248,17 @@ SOURCES_libvlc_darwin = \
        misc/darwin_specific.c \
        $(NULL)
 
+SOURCES_libvlc_linux = \
+       misc/linux_specific.c \
+       $(NULL)
+
 SOURCES_libvlc_win32 = \
        misc/win32_specific.c \
+       network/winsock.c \
        $(NULL)
 
+SOURCES_libvlc_other = misc/not_specific.c
+
 SOURCES_libvlc_dirent = \
        extras/dirent.c \
        $(NULL)
@@ -302,7 +325,6 @@ SOURCES_libvlc_common = \
        network/acl.c \
        network/getaddrinfo.c \
        network/io.c \
-       network/error.c \
        network/tcp.c \
        network/udp.c \
        network/httpd.c \
@@ -349,6 +371,7 @@ SOURCES_libvlc_common = \
 
 SOURCES_libvlc_sout = \
        input/vlm.c \
+       input/vlmshell.c \
        stream_output/stream_output.c \
        stream_output/stream_output.h \
        stream_output/announce.c \
@@ -476,7 +499,7 @@ test_headers_SOURCES = test/headers.c
 test_headers_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 ; \
@@ -485,7 +508,9 @@ check-local:
                        exit 1; \
                fi ; \
        done
-       $(srcdir)/check_headers $(dist_pkginclude_HEADERS) $(pkginclude_HEADERS)
+       $(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