File names have been modified

[vlc] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 14ba5fd8483769d16f3c9eb8882cde6045c31ba5..d26ccb27dd2868a6b48c336f1b80198c9303c91b 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)
 
 ###############################################################################
@@ -112,6 +112,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
 ###############################################################################
@@ -128,24 +142,24 @@ endif
 
 libvlc_la_SOURCES = $(SOURCES_libvlc)
 nodist_libvlc_la_SOURCES = misc/revision.c
-libvlc_la_LIBADD = $(LTLIBINTL)
 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc`
 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc`
 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc`
-libvlc_la_LDFLAGS = `$(VLC_CONFIG) --libs libvlc` $(AM_LDFLAGS) \
+libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \
        -version-info 1:0:0
 if HAVE_COMPILER_EXPORT
 libvlc_la_LDFLAGS += -export-dynamic
 else
 libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym 
 endif
+libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL)
 
 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 +271,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 \
@@ -322,7 +335,8 @@ SOURCES_libvlc_control = \
        control/audio.c \
        control/dynamic_media_list.c \
        control/event.c \
-       control/flat_media_list.c \
+       control/flat_media_list_view.c \
+       control/hierarchical_media_list_view.c \
        control/media_descriptor.c \
        control/media_instance.c \
        control/media_list.c \
@@ -351,7 +365,7 @@ misc/revision.c:
 ###############################################################################
 # Unit/regression test
 ###############################################################################
-check_PROGRAMS = test_i18n_atof test_url test_utf8
+check_PROGRAMS = test_i18n_atof test_url test_utf8 test_control
 TESTS = $(check_PROGRAMS)
 
 CFLAGS_tests = `$(VLC_CONFIG) --cflags libvlc`
@@ -367,6 +381,10 @@ test_utf8_SOURCES = test/utf8.c
 test_utf8_LDADD = libvlc.la
 test_utf8_CFLAGS = $(CFLAGS_tests)
 
+test_control_SOURCES = control/testapi.c
+test_control_LDADD = libvlc-control.la
+test_control_CFLAGS = $(CFLAGS_tests)
+
 FORCE:
        @echo "Generated source cannot be phony. Go away." >&2
        @exit 1