Revert silly commit

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 278220a75e36853c60a191c86503c015d3278208..987a432a3cebcdd56ac16071789cbaf894aad374 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 NULL =
 EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
 
-BUILT_SOURCES = modules/builtin.h misc/revision.c
+BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h
 CLEANFILES = $(BUILT_SOURCES)
 
 ###############################################################################
@@ -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 \
@@ -112,6 +115,20 @@ endif
 
 modules/modules.c: modules/builtin.h
 
+../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
+       rm -f -- "$@.tmp"
+       mkdir -p -- ../include
+       echo "/* Automatically generated file - DO NOT EDIT */" > "$@.tmp"
+       echo "static const char psz_license[] =" >> "$@.tmp"
+       cat $(top_srcdir)/COPYING | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       echo "static const char psz_thanks[] =" >> "$@.tmp"
+       grep -v '$$Id:'  $(top_srcdir)/THANKS | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }'|sed s/"<.*.> "// >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       echo "static const char psz_authors[] =" >> "$@.tmp"
+       grep N: $(top_srcdir)/AUTHORS | cut -d" " -f 2- | sed s/'"'/'\\"'/g | $(AWK) '{ print "\""$$0"\\n\"" }' >> "$@.tmp"
+       echo ";" >> "$@.tmp"
+       mv -f -- "$@.tmp" "$@"
 ###############################################################################
 # Building libvlc
 ###############################################################################
@@ -145,7 +162,7 @@ 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_LDFLAGS = $(AM_LDFLAGS) -version-info 0:0:0
+libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_control_la_LDFLAGS += -export-dynamic
 else
@@ -257,7 +274,6 @@ SOURCES_libvlc_common = \
        stream_output/sap.c \
        stream_output/sdp.c \
        osd/osd.c \
-       osd/osd_parser.c \
        osd/osd_text.c \
        osd/osd_widgets.c \
        network/acl.c \
@@ -282,13 +298,18 @@ SOURCES_libvlc_common = \
        misc/block.c \
        modules/modules.h \
        modules/modules.c \
+       modules/cache.c \
        modules/entry.c \
+       modules/os.c \
        misc/threads.c \
        misc/stats.c \
        misc/cpu.c \
-       modules/configuration.h \
-       modules/configuration.c \
-       modules/configuration_chain.c \
+       config/configuration.h \
+       config/core.c \
+       config/chain.c \
+       config/file.c \
+       config/intf.c \
+       config/cmdline.c \
        misc/events.c \
        misc/image.c \
        misc/messages.c \
@@ -323,6 +344,8 @@ SOURCES_libvlc_control = \
        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_list.c \
@@ -351,12 +374,21 @@ misc/revision.c:
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-check_PROGRAMS = test_i18n_atof test_url test_utf8
-TESTS = $(check_PROGRAMS)
+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
@@ -367,6 +399,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