Don't set DATA_PATH when building plugins - fixes #1464

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 152f0afbd7a8627203ba4078e6ba72c156bc10b8..b167dba8865d3e9470584b89e05d0a89579baf1b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,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 \
@@ -68,7 +69,9 @@ HEADERS_include = \
        ../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 \
@@ -142,7 +145,8 @@ 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` \
+       -DDATA_PATH=\"$(pkgdatadir)\"
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
@@ -301,10 +305,11 @@ SOURCES_libvlc_common = \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       config/config.h \
+       config/configuration.h \
        config/core.c \
        config/chain.c \
        config/file.c \
+       config/intf.c \
        config/cmdline.c \
        misc/events.c \
        misc/image.c \
@@ -341,6 +346,7 @@ SOURCES_libvlc_control = \
        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_list.c \
@@ -369,13 +375,21 @@ misc/revision.c:
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-check_PROGRAMS = test_i18n_atof test_url test_utf8 test_control
+check_PROGRAMS = \
+       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_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
@@ -386,10 +400,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