]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove unused comments
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 97ccb95071d00239890f42cf2fcb417320ef018c..b6f57501393b1a89ae551a51537db769e2cf0442 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 \
@@ -164,6 +165,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -228,6 +232,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        extras/MacOSX/macosx-dmg \
+       \
+       extras/Makefile \
+       extras/zsh.cpp \
        $(NULL)
 
 ###############################################################################
@@ -251,8 +258,8 @@ EXTRA_DIST += \
        $(NULL)
 
 dist-hook:
-       cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
-       distdir=$(distdir) srcdir=$(srcdir) $(srcdir)/toolbox --dist-contrib
+       cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc
+       distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
 
 ###############################################################################
 # Building libvlc
@@ -263,6 +270,9 @@ vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
        cd $(top_builddir) && $(SHELL) ./config.status --file=$@
        -cd $(top_builddir) && chmod 0755 $@
 
+vlc-config.in: vlc-config.in.in
+       ./config.status --recheck
+
 $(SOURCES): vlc-config
 
 CLEANFILES = $(BUILT_SOURCES)
@@ -376,6 +386,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 \
@@ -384,6 +397,7 @@ SOURCES_libvlc_common = \
        src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
+       src/misc/unicode.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
        src/misc/image.c \
@@ -436,9 +450,9 @@ DEPENDENCIES_vlc = lib/libvlc.a $(DATA_win32_rc) $(LIB_intl)
 vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        @rm -f $(top_builddir)/vlc$(EXEEXT)
        @case `$(VLC_CONFIG) --linkage vlc builtin` in \
-         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
-         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) ;; \
+         c++) echo $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(CXXLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         objc) echo $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(OBJCLINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
+         c|*) echo $(LINK) $(vlc_OBJECTS) $(vlc_LDFLAGS) $(LIBS) ; $(LINK) $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS) $(LIBS) $(vlc_LDADD) ;; \
        esac
 
 if HAVE_BEOS
@@ -560,6 +574,10 @@ VLC-release.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
+        bookmarks.h \
+        bookmarks.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -670,6 +688,10 @@ VLC.app: vlc
            voutgl.m \
            wizard.h \
            wizard.m \
+           extended.h \
+           extended.m \
+        bookmarks.h \
+        bookmarks.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -798,6 +820,49 @@ package-win32-base:
          cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
        done
 
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
+       for i in $(srcdir)/share/osdmenu/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
+         unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
+       done
+
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
+       for i in $(srcdir)/share/osdmenu/default/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
+         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
+       done
+       for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
+         cp $$i $(top_builddir)/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/ ;
@@ -957,6 +1022,32 @@ package-translations:
        $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
          | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
 
+###############################################################################
+# PO translation files update
+###############################################################################
+.PHONY: update-po
+
+update-po:
+       rm -f $(top_srcdir)/po/POTFILES.in
+       { \
+         cd $(top_srcdir) ; \
+         echo "# automatically created by make update-po" ; \
+         echo "" ; \
+         echo "# main sources" ; \
+         find include src -name '*.[chm]' -o -name '*.[ch]pp' \
+           | grep -v '\(vlc_symbols\|misc/modules_\)' \
+           | sort ; \
+         echo "" ; \
+         echo "# modules" ; \
+         find modules -name '*.[chm]' -o -name '*.[ch]pp' \
+           | grep -v '\(\.moc\.\|gui/gtk2/\)' \
+           | sort ; \
+       } > $(top_srcdir)/po/POTFILES.in
+       rm -f $(top_srcdir)/po/vlc.pot
+       cd po && $(MAKE) POTFILES $(top_srcdir)/../po/vlc.pot update-po
+
+#cd po && $(MAKE) update-po
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -974,7 +1065,8 @@ stamp-builtin: FORCE
        @if test ! -f $@; then printf "" > $@; fi
 
 stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl src/misc/modules_builtin.h.in
-       cd $(srcdir) && cat $(HEADERS_include) | perl ./vlc-api.pl
+       ( cd $(srcdir) && cat $(HEADERS_include) ) | \
+         top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
 ###############################################################################
Unnamed repository; edit this file 'description' to name the repository.