[vlc-commits] Fix make dist after ID3Genres.h move to meta_engine

2017-05-31 Thread Nicolas Chauvet
vlc | branch: master | Nicolas Chauvet  | Wed May 31 
12:43:17 2017 +0200| [d3f01827897854e32e78f32264a73d750bb87ffc] | committer: 
Francois Cartegnie

Fix make dist after ID3Genres.h move to meta_engine

Signed-off-by: Nicolas Chauvet 
Signed-off-by: Francois Cartegnie 

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d3f01827897854e32e78f32264a73d750bb87ffc
---

 modules/demux/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 656675391c..3067e39d18 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -205,9 +205,9 @@ libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \
demux/mp4/libmp4.c demux/mp4/libmp4.h \
demux/mp4/languages.h \
demux/asf/asfpacket.c demux/asf/asfpacket.h \
-   demux/meta_engine/ID3Genres.h \
demux/mp4/avci.h \
-   demux/mp4/essetup.c demux/mp4/meta.c
+   demux/mp4/essetup.c demux/mp4/meta.c \
+   meta_engine/ID3Genres.h
 libmp4_plugin_la_LIBADD = $(LIBM)
 libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_ZLIB

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist and POTFILES.in

2015-07-12 Thread David Fuhrmann
vlc/vlc-2.2 | branch: master | David Fuhrmann dfuhrm...@videolan.org | Sat 
Jul 11 15:00:24 2015 +0200| [451fb8905311779be0871709e327ed0da6fcc34c] | 
committer: David Fuhrmann

Fix make dist and POTFILES.in

(cherry picked from commit 39cafcda8b32a5b3a759ab1dd7dce50e25ed4596)
Signed-off-by: David Fuhrmann dfuhrm...@videolan.org

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=451fb8905311779be0871709e327ed0da6fcc34c
---

 Makefile.am|1 +
 po/POTFILES.in |2 ++
 2 files changed, 3 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index b66c21b..febdc63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,6 +152,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib 
\
extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \
extras/package/macosx/Resources/English.lproj/Preferences.xib \
+   extras/package/macosx/Resources/English.lproj/ResumeDialog.xib \
extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \
extras/package/macosx/Resources/English.lproj/SyncTracks.xib \
extras/package/macosx/Resources/English.lproj/VideoEffects.xib \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0a7c635..62e813e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -586,6 +586,8 @@ modules/gui/macosx/prefs.h
 modules/gui/macosx/prefs.m
 modules/gui/macosx/prefs_widgets.h
 modules/gui/macosx/prefs_widgets.m
+modules/gui/macosx/ResumeDialogController.h
+modules/gui/macosx/ResumeDialogController.m
 modules/gui/macosx/simple_prefs.h
 modules/gui/macosx/simple_prefs.m
 modules/gui/macosx/StringUtility.h

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2013-12-05 Thread Jean-Baptiste Kempf
vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu 
Dec  5 19:02:15 2013 +0100| [9ebead9dfbdcac2da31bc856cec51c058f5ddca8] | 
committer: Jean-Baptiste Kempf

Fix make dist

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=9ebead9dfbdcac2da31bc856cec51c058f5ddca8
---

 Makefile.am |7 ---
 1 file changed, 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0d169cd..15b4609 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -540,13 +540,6 @@ EXTRA_DIST += \
extras/package/macosx/configure.sh \
extras/package/macosx/dmg_setup.scpt \
extras/package/macosx/vlc.xcodeproj/project.pbxproj \
-   extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \
-   extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \
-   extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
 \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt
 \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2013-12-05 Thread Jean-Baptiste Kempf
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Dec  5 
19:04:12 2013 +0100| [27de05c91f5553a36eee7a7ca127860cd816c9f1] | committer: 
Jean-Baptiste Kempf

Fix make dist

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=27de05c91f5553a36eee7a7ca127860cd816c9f1
---

 Makefile.am |7 ---
 1 file changed, 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ee0ff43..a3f9894 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -547,13 +547,6 @@ EXTRA_DIST += \
extras/package/macosx/configure.sh \
extras/package/macosx/dmg_setup.scpt \
extras/package/macosx/vlc.xcodeproj/project.pbxproj \
-   extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \
-   extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \
-   extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
 \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
-   
extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt
 \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] fix make dist

2013-11-11 Thread Felix Paul Kühne
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Mon Nov 11 
17:19:09 2013 +0100| [a19d8403aa91d18b0645d6888f40d0c60baa4517] | committer: 
Felix Paul Kühne

fix make dist

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a19d8403aa91d18b0645d6888f40d0c60baa4517
---

 Makefile.am |6 ++
 1 file changed, 6 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index cfcc33f..ee0ff43 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -122,12 +122,18 @@ EXTRA_DIST += \
extras/package/macosx/Resources/English.lproj/Bookmarks.xib \
extras/package/macosx/Resources/English.lproj/ConvertAndSave.xib \
extras/package/macosx/Resources/English.lproj/CoreDialogs.xib \
+   extras/package/macosx/Resources/English.lproj/CrashReporter.xib \
+   
extras/package/macosx/Resources/English.lproj/DebugMessageVisualizer.xib \
extras/package/macosx/Resources/English.lproj/DetachedVideoWindow.xib \
extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
+   extras/package/macosx/Resources/English.lproj/FSPanel.xib \
extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
extras/package/macosx/Resources/English.lproj/MainMenu.xib \
+   extras/package/macosx/Resources/English.lproj/MainWindow.xib \
extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
extras/package/macosx/Resources/English.lproj/Open.xib \
+   extras/package/macosx/Resources/English.lproj/PlaylistAccessoryView.xib 
\
+   extras/package/macosx/Resources/English.lproj/PlaylistMenu.xib \
extras/package/macosx/Resources/English.lproj/Preferences.xib \
extras/package/macosx/Resources/English.lproj/SharedDialogs.xib \
extras/package/macosx/Resources/English.lproj/SyncTracks.xib \

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist after 9d29844fd1028

2013-07-08 Thread Rafaël Carré
vlc | branch: master | Rafaël Carré fun...@videolan.org | Mon Jul  8 08:45:12 
2013 +0200| [b14d3897e26d001afec0fd394d7b9ec06455e6b2] | committer: Rafaël Carré

Fix make dist after 9d29844fd1028

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b14d3897e26d001afec0fd394d7b9ec06455e6b2
---

 modules/common.am |1 -
 modules/genmf |2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/common.am b/modules/common.am
index c766fc1..4899988 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -7,7 +7,6 @@
 
 NULL =
 libvlcdir = $(vlclibdir)/plugins/$(basedir)
-EXTRA_DIST = Modules.am
 BUILT_SOURCES =
 CLEANFILES = $(BUILT_SOURCES)
 
diff --git a/modules/genmf b/modules/genmf
index c6b2bca..8b0e26a 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -44,6 +44,8 @@ mods = ${mods}
 libvlc_LTLIBRARIES = ${libvlc_ltlibs}
 EXTRA_LTLIBRARIES = ${extra_ltlibs}
 
+EXTRA_DIST = Modules.am
+
 include \$(top_srcdir)/modules/common.am
 include \$(srcdir)/Modules.am
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2013-01-05 Thread Rafaël Carré
npapi-vlc | branch: master | Rafaël Carré fun...@videolan.org | Sun Jan  6 
00:23:34 2013 +0100| [fb956734f0957cbbb1e1cb9047437fe81760c6de] | committer: 
Rafaël Carré

Fix make dist

 http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=fb956734f0957cbbb1e1cb9047437fe81760c6de
---

 Makefile.am |   13 -
 activex/Makefile.am |7 ---
 npapi/Makefile.am   |7 ++-
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a661b9c..c7625e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,12 +15,23 @@ if BUILD_ACTIVEX
 SUBDIRS += activex
 endif
 
+DISTCHECK_CONFIGURE_FLAGS=--without-gtk
+
 EXTRA_DIST = \
autogen.sh \
extras/macosx/Info.plist.in \
extras/macosx/InstallerInfo.plist.in \
extras/macosx/InstallerDescription.plist \
-   extras/macosx/pbdevelopment.plist
+   extras/macosx/pbdevelopment.plist \
+   share/pixmaps/win32/fullscreen.bmp \
+   share/pixmaps/win32/defullscreen.bmp \
+   share/pixmaps/win32/play.bmp \
+   share/pixmaps/win32/pause.bmp \
+   share/pixmaps/win32/volume.bmp \
+   share/pixmaps/win32/volume-muted.bmp \
+   share/test/test.html \
+   share/test/windowless.html \
+   share/test/resize.html
 
 package-macosx-plugin:
 # Create Installer
diff --git a/activex/Makefile.am b/activex/Makefile.am
index f1b6130..d051560 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -18,13 +18,6 @@ DIST_misc = \
 axvlc.tlb \
 inplace.bmp \
 vlc16x16.bmp \
-../share/pixmaps/win32/fullscreen.bmp \
-../share/pixmaps/win32/defullscreen.bmp \
-../share/pixmaps/win32/play.bmp \
-../share/pixmaps/win32/pause.bmp \
-../share/pixmaps/win32/volume.bmp \
-../share/pixmaps/win32/volume-muted.bmp \
-../share/test.html \
 $(NULL)
 
 
diff --git a/npapi/Makefile.am b/npapi/Makefile.am
index 5b16024..0d4b146 100644
--- a/npapi/Makefile.am
+++ b/npapi/Makefile.am
@@ -4,7 +4,12 @@
 
 EXTRA_DIST = package/npvlc_rc.rc.in package/npvlc.dll.manifest
 MOSTLYCLEANFILES =
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES) \
+   npapi-sdk/npapi.h \
+   npapi-sdk/npfunctions.h \
+   npapi-sdk/npruntime.h \
+   npapi-sdk/nptypes.h
+
 npvlcdir = $(libdir)/mozilla/plugins
 
 AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Inpapi-sdk $(MOZILLA_CFLAGS)

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] fix make dist

2012-10-23 Thread Felix Paul Kühne
vlc/vlc-2.0 | branch: master | Felix Paul Kühne fkue...@videolan.org | Tue 
Oct 23 14:04:22 2012 +0200| [9554d1a8bb0106d4a067a70337991a67074d93b8] | 
committer: Felix Paul Kühne

fix make dist

reported by eartle

 http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=9554d1a8bb0106d4a067a70337991a67074d93b8
---

 Makefile.am |2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 7a3cb67..6450b23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -212,6 +212,8 @@ EXTRA_DIST += \

extras/package/macosx/Resources/mainwindow/effects-one-button-b...@2x.png \
extras/package/macosx/Resources/mainwindow/effects-one-button.png \
extras/package/macosx/Resources/mainwindow/effects-one-but...@2x.png \
+   
extras/package/macosx/Resources/mainwindow/effects-one-button-pressed.png \
+   
extras/package/macosx/Resources/mainwindow/effects-one-button-pres...@2x.png \
extras/package/macosx/Resources/mainwindow/forward-pressed.png \
extras/package/macosx/Resources/mainwindow/forward-pres...@2x.png \
extras/package/macosx/Resources/mainwindow/forward.png \

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2012-09-12 Thread Jean-Baptiste Kempf
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Sep 13 
00:08:26 2012 +0200| [597c0dec1647fc448117fff915b09e8093b1dbe0] | committer: 
Jean-Baptiste Kempf

Fix make dist

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=597c0dec1647fc448117fff915b09e8093b1dbe0
---

 Makefile.am |   66 +--
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 29ef3c3..c926d06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,39 +21,39 @@ EXTRA_DIST = \
extras/package/win32/configure.sh \
extras/package/symbian/configure.sh \
extras/package/npapi.am \
-   extras/package/win32/vlc.win32.nsi.in \
-   extras/package/win32/spad.nsi.in \
-   extras/package/win32/UAC.nsh \
-   extras/package/win32/languages/declaration.nsh \
-   extras/package/win32/languages/bengali.nsh \
-   extras/package/win32/languages/basque.nsh \
-   extras/package/win32/languages/brazilian_portuguese.nsh \
-   extras/package/win32/languages/bulgarian.nsh \
-   extras/package/win32/languages/catalan.nsh \
-   extras/package/win32/languages/danish.nsh \
-   extras/package/win32/languages/dutch.nsh \
-   extras/package/win32/languages/english.nsh \
-   extras/package/win32/languages/estonian.nsh \
-   extras/package/win32/languages/finnish.nsh \
-   extras/package/win32/languages/french.nsh \
-   extras/package/win32/languages/galician.nsh \
-   extras/package/win32/languages/german.nsh \
-   extras/package/win32/languages/hebrew.nsh \
-   extras/package/win32/languages/hungarian.nsh \
-   extras/package/win32/languages/italian.nsh \
-   extras/package/win32/languages/japanese.nsh \
-   extras/package/win32/languages/lithuanian.nsh \
-   extras/package/win32/languages/occitan.nsh \
-   extras/package/win32/languages/polish.nsh \
-   extras/package/win32/languages/punjabi.nsh \
-   extras/package/win32/languages/russian.nsh
-   extras/package/win32/languages/romanian.nsh \
-   extras/package/win32/languages/schinese.nsh \
-   extras/package/win32/languages/slovak.nsh \
-   extras/package/win32/languages/slovenian.nsh \
-   extras/package/win32/languages/sorani.nsh \
-   extras/package/win32/languages/spanish.nsh \
-   extras/package/win32/languages/swedish.nsh
+   extras/package/win32/NSIS/vlc.win32.nsi.in \
+   extras/package/win32/NSIS/spad.nsi.in \
+   extras/package/win32/NSIS/UAC.nsh \
+   extras/package/win32/NSIS/languages/declaration.nsh \
+   extras/package/win32/NSIS/languages/bengali.nsh \
+   extras/package/win32/NSIS/languages/basque.nsh \
+   extras/package/win32/NSIS/languages/brazilian_portuguese.nsh \
+   extras/package/win32/NSIS/languages/bulgarian.nsh \
+   extras/package/win32/NSIS/languages/catalan.nsh \
+   extras/package/win32/NSIS/languages/danish.nsh \
+   extras/package/win32/NSIS/languages/dutch.nsh \
+   extras/package/win32/NSIS/languages/english.nsh \
+   extras/package/win32/NSIS/languages/estonian.nsh \
+   extras/package/win32/NSIS/languages/finnish.nsh \
+   extras/package/win32/NSIS/languages/french.nsh \
+   extras/package/win32/NSIS/languages/galician.nsh \
+   extras/package/win32/NSIS/languages/german.nsh \
+   extras/package/win32/NSIS/languages/hebrew.nsh \
+   extras/package/win32/NSIS/languages/hungarian.nsh \
+   extras/package/win32/NSIS/languages/italian.nsh \
+   extras/package/win32/NSIS/languages/japanese.nsh \
+   extras/package/win32/NSIS/languages/lithuanian.nsh \
+   extras/package/win32/NSIS/languages/occitan.nsh \
+   extras/package/win32/NSIS/languages/polish.nsh \
+   extras/package/win32/NSIS/languages/punjabi.nsh \
+   extras/package/win32/NSIS/languages/russian.nsh
+   extras/package/win32/NSIS/languages/romanian.nsh \
+   extras/package/win32/NSIS/languages/schinese.nsh \
+   extras/package/win32/NSIS/languages/slovak.nsh \
+   extras/package/win32/NSIS/languages/slovenian.nsh \
+   extras/package/win32/NSIS/languages/sorani.nsh \
+   extras/package/win32/NSIS/languages/spanish.nsh \
+   extras/package/win32/NSIS/languages/swedish.nsh
 
 dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2012-08-16 Thread Jean-Baptiste Kempf
vlc | branch: master | Jean-Baptiste Kempf j...@videolan.org | Thu Aug 16 
16:51:32 2012 +0200| [77ed9b1d806f83312d40aa909085ee5977b82b37] | committer: 
Jean-Baptiste Kempf

Fix make dist

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=77ed9b1d806f83312d40aa909085ee5977b82b37
---

 po/POTFILES.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0338db6..46d3586 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1082,7 +1082,7 @@ modules/video_filter/mosaic.c
 modules/video_filter/mosaic.h
 modules/video_filter/motionblur.c
 modules/video_filter/motiondetect.c
-modules/video_filter/opencv_example.c
+modules/video_filter/opencv_example.cpp
 modules/video_filter/opencv_wrapper.c
 modules/video_filter/osdmenu.c
 modules/video_filter/panoramix.c

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] Fix make dist

2012-01-24 Thread Pavlov Konstantin
npapi-vlc | branch: master | Pavlov Konstantin thr...@videolan.org | Tue Jan 
24 19:10:30 2012 +0100| [770491b8b496a0fcffee2b884786a9564fc7ca5c] | committer: 
Jean-Baptiste Kempf

Fix make dist

Signed-off-by: Jean-Baptiste Kempf j...@videolan.org

 http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=770491b8b496a0fcffee2b884786a9564fc7ca5c
---

 Makefile.am |2 +-
 activex/Makefile.am |   10 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 52c4039..a661b9c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ AUTOMAKE_OPTIONS = \
dist-xz \
no-dist-gzip
 
-DIST_SUBDIRS= share npapi activex common
+DIST_SUBDIRS= share npapi activex
 SUBDIRS =
 if BUILD_NPAPI
 SUBDIRS += npapi
diff --git a/activex/Makefile.am b/activex/Makefile.am
index ea876ac..3b40b0d 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -20,11 +20,11 @@ DIST_misc = \
 vlc16x16.bmp \
 ../share/pixmaps/win32/fullscreen.bmp \
 ../share/pixmaps/win32/defullscreen.bmp \
-../share/pixmaps/win32/pixmaps/play.bmp \
-../share/pixmaps/win32/pixmaps/pause.bmp \
-../share/pixmaps/win32/pixmaps/volume.bmp \
-../share/pixmaps/win32/pixmaps/volume-muted.bmp \
-test.html \
+../share/pixmaps/win32/play.bmp \
+../share/pixmaps/win32/pause.bmp \
+../share/pixmaps/win32/volume.bmp \
+../share/pixmaps/win32/volume-muted.bmp \
+../share/test.html \
 $(NULL)
 
 

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] fix make dist

2011-07-17 Thread Rafaël Carré
vlc | branch: master | Rafaël Carré rafael.ca...@gmail.com | Sun Jul 17 
23:03:00 2011 -0400| [bc879ea1c46352fdb71ee76aeb2f7d99c5311993] | committer: 
Rafaël Carré

fix make dist

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bc879ea1c46352fdb71ee76aeb2f7d99c5311993
---

 src/Makefile.am |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b180edf..14e2175 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,6 +46,7 @@ pluginsinclude_HEADERS = \
../include/vlc_access.h \
../include/vlc_acl.h \
../include/vlc_aout.h \
+   ../include/vlc_aout_intf.h \
../include/vlc_aout_mixer.h \
../include/vlc_arrays.h \
../include/vlc_art_finder.h \

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits


[vlc-commits] fix make dist as pointed by linkfanel

2011-06-23 Thread Felix Paul Kühne
vlc | branch: master | Felix Paul Kühne fkue...@videolan.org | Fri Jun 24 
00:35:19 2011 +0200| [456b3660943eeb687aec44efb91617f8d0dff551] | committer: 
Felix Paul Kühne

fix make dist as pointed by linkfanel

 http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=456b3660943eeb687aec44efb91617f8d0dff551
---

 Makefile.am |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0bec971..67d16f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,7 +248,7 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/volumetrack.png \
extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
-   extras/package/macosx/Resources/mainwindow/bottom-background_dark.png \
+   
extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \

extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png
 \

extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png
 \

extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png 
\

___
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits