* modules/gui/wxwindows/interface.cpp: disable the new wizard until it is useable.

* doc/Makefile.am: don't include directories directly (will put all sorts of junk in make dist).
* modules/demux/mp4/Modules.am: get rid of mp4.h.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 30872c2a102e3450061c6548dd08a42d3cc204ca..96415d5ab987168cc463ee7a504ec18c547f3a7a 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -31,7 +31,11 @@ EXTRA_DIST = \
        lirc/example.lircrc \
        skins/skins-howto.txt \
        skins/events-howto.txt \
-       skins/curve_maker \
+       skins/curve_maker/Bezier.bas \
+       skins/curve_maker/Bezier.frm \
+       skins/curve_maker/Bezier.frx \
+       skins/curve_maker/bezier.vbp \
+       skins/curve_maker/Bezier.vbw \
        strings.txt \
        translations.txt \
        win32/Cross-Compile-Howto.txt \

diff --git a/modules/demux/mp4/Modules.am b/modules/demux/mp4/Modules.am
index ef5bd2dd641bd2d461478e734405b202789d5554..9e1639e8c363ae0d308ae98f8737d83f0e979eb9 100644 (file)
--- a/modules/demux/mp4/Modules.am
+++ b/modules/demux/mp4/Modules.am
@@ -1,6 +1,5 @@
 SOURCES_mp4 = \
        mp4.c \
-       mp4.h \
        libmp4.c \
        libmp4.h \
        drms.c \

diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp
index f00f1b2cd5cb9678fcd2331f8899683615fc75ac..5acc76811bd388f0e09e1a300e96b9de57c6e539 100644 (file)
--- a/modules/gui/wxwindows/interface.cpp
+++ b/modules/gui/wxwindows/interface.cpp
@@ -336,7 +336,9 @@ void Interface::CreateOurMenuBar()
     file_menu->AppendSeparator();
     file_menu->Append( StreamWizard_Event,
                        wxU(_("Streaming &Wizard...\tCtrl-W")) );
+#if 0
     file_menu->Append( Wizard_Event, wxU(_("New Wizard...")) );
+#endif
     file_menu->AppendSeparator();
     file_menu->Append( Exit_Event, wxU(_("E&xit\tCtrl-X")) );