Forward port of branches/0.8.1-jpsaman-thedj revision 12070. The OSD menu subsystem...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 43f3a9755b2ba114d5893a6c20823d2d96f39a2d..1d92fc9438f15a2b96fdacfb2c9e9e67125f19d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,6 +112,7 @@ HEADERS_include = \
        include/vlc_messages.h \
        include/vlc_meta.h \
        include/vlc_objects.h \
+       include/vlc_osd.h \
        include/vlc_playlist.h \
        include/vlc_spu.h \
        include/vlc_stream.h \
@@ -382,6 +383,9 @@ SOURCES_libvlc_common = \
        src/stream_output/announce.c \
        src/stream_output/sap.c \
        src/stream_output/acl.c \
+       src/osd/osd.c \
+       src/osd/osd_widgets.c \
+       src/osd/osd_parser.c \
        src/misc/charset.c \
        src/misc/httpd.c \
        src/misc/tls.c \
@@ -813,6 +817,49 @@ package-win32-base:
          cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
        done
 
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/selected"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/unselect"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/selection"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/dvd/volume"
+       for i in $(srcdir)/share/osdmenu/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/ || true ; \
+         unix2dos $(srcdir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
+       done
+
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/selected"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/selection"
+       mkdir -p "$(srcdir)/vlc-${VERSION}/osdmenu/default/volume"
+       for i in $(srcdir)/share/osdmenu/default/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+       done
+
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
        mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;