diff --git a/configure.ac b/configure.ac index 6013a1e7c..d7a1cb1b7 100644 --- a/configure.ac +++ b/configure.ac @@ -314,11 +314,6 @@ AC_ARG_ENABLE(dynamicdemux, AS_HELP_STRING([--enable-dynamicdemux], [enable dynamic demux @<:@default=no@:>@]), AC_DEFINE(DYNAMIC_DEMUX, 1, [enable dynamic demux])) -AC_ARG_ENABLE(testing, - AS_HELP_STRING([--enable-testing], [enable development code @<:@default=no@:>@]), - AC_DEFINE(ENABLE_TESTING, 1, [enable development code])) -AM_CONDITIONAL(ENABLE_TESTING, test "$enable_testing" = "yes") - AC_ARG_ENABLE(fribidi, AS_HELP_STRING([--enable-fribidi], [enable fribidi support @<:@default=no@:>@]), AC_DEFINE(ENABLE_FRIBIDI, 1, [enable fribidi support])) diff --git a/data/icons/various/Makefile.am b/data/icons/various/Makefile.am index 9b5580ea7..ad51e74df 100644 --- a/data/icons/various/Makefile.am +++ b/data/icons/various/Makefile.am @@ -12,7 +12,6 @@ install_DATA = \ tmdb.png \ volume.png -if ENABLE_TESTING - install_DATA += \ +# used by testmenu only +install_DATA += \ tux.svg -endif diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index af6b33512..da888bd13 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -97,6 +97,7 @@ libneutrino_gui_a_SOURCES = \ sleeptimer.cpp \ start_wizard.cpp \ subchannel_select.cpp \ + test_menu.cpp \ themes.cpp \ timeosd.cpp \ update.cpp \ @@ -162,11 +163,6 @@ libneutrino_gui_a_SOURCES += \ psisetup.cpp endif -if ENABLE_TESTING -libneutrino_gui_a_SOURCES += \ - test_menu.cpp -endif - libneutrino_gui2_a_SOURCES = \ cam_menu.cpp \ color.cpp \ diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index 7d2bc2aa8..11721e41b 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -68,9 +68,6 @@ #include "gui/sleeptimer.h" #include "gui/timerlist.h" #include "gui/update_menue.h" -#ifdef ENABLE_TESTING -#include "gui/test_menu.h" -#endif #include "gui/update.h" #include "gui/vfd_setup.h" #include "gui/videosettings.h" @@ -282,10 +279,6 @@ void CNeutrinoApp::InitMenuMain() mf->setHint(NEUTRINO_ICON_HINT_CI, LOCALE_MENU_HINT_CI); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]); } - -#ifdef ENABLE_TESTING - personalize.addItem(MENU_MAIN, new CMenuForwarder("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO); -#endif } // settings menue