[gnome-applets/wip/muktupavels/cleanup: 1/17] build: always build mini-commander

[Alberts Muktupāvels <muktupavels src gnome org>]

commit c105ef008a5776d4e169e423da12080e3c2bb53e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Tue Mar 24 16:19:08 2020 +0200

    build: always build mini-commander

 .gitlab-ci.yml             |  4 ++--
 Makefile.am                | 10 +++-------
 configure.ac               |  9 +--------
 help/Makefile.am           |  7 +------
 mini-commander/Makefile.am |  6 ------
 5 files changed, 7 insertions(+), 29 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d6fb2ffb..e6321f08f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ build-ubuntu:
                       xsltproc
                       yelp-tools
   script:
-    - ./autogen.sh --disable-Werror --enable-mini-commander
+    - ./autogen.sh --disable-Werror
     - make
     - make distcheck
 
@@ -93,7 +93,7 @@ coverity:
       --data "token=$COVERITY_TOKEN&project=gnome-applets"
       --output /tmp/coverity_tool.tgz
     - tar zxf /tmp/coverity_tool.tgz
-    - CC=clang ./autogen.sh --disable-Werror --enable-mini-commander
+    - CC=clang ./autogen.sh --disable-Werror
     - ./cov-analysis-linux64-*/bin/cov-build --dir cov-int make
     - tar czf cov-int.tar.gz cov-int
     - curl --form token=$COVERITY_TOKEN
diff --git a/Makefile.am b/Makefile.am
index ab443705a..ec8a9f1bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,10 +23,6 @@ if BUILD_CPUFREQ_APPLET
 cpufreq_SUBDIR = cpufreq
 endif
 
-if BUILD_MINICOMMANDER_APPLET
-minicommander_applet_SUBDIR = mini-commander
-endif
-
 if HAVE_TRACKER_SEARCH_BAR
 tracker_search_bar_SUBDIR = tracker-search-bar
 endif
@@ -42,6 +38,7 @@ always_built_SUBDIRS =  \
        drivemount      \
        inhibit         \
        geyes           \
+       mini-commander \
        sticky-notes    \
        trash \
        window-buttons \
@@ -60,7 +57,6 @@ SUBDIRS = \
        $(battstat_SUBDIR)      \
        $(accessx_status_SUBDIR)\
        $(cpufreq_SUBDIR) \
-       $(minicommander_applet_SUBDIR) \
        $(tracker_search_bar_SUBDIR) \
        $(timer_SUBDIR) \
        $(NULL)
@@ -95,9 +91,9 @@ EXTRA_DIST = \
        COPYING-DOCS \
        $(NULL)
 
-AM_DISTCHECK_CONFIGURE_FLAGS = \
+AM_DISTCHECK_CONFIGURE_FLAGS = \
        --with-libpanel-applet-dir='$${datadir}/gnome-panel/distcheck/applets' \
-       --enable-mini-commander
+       $(NULL)
 
 MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
diff --git a/configure.ac b/configure.ac
index 734097c3c..f409003d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,13 +331,6 @@ AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes")
 AM_CONDITIONAL(NEED_LIBAPM, test "x$NEED_LIBAPM" = "xyes")
 AM_CONDITIONAL(BUILD_BATTSTAT_APPLET, test x$build_battstat_applet = xyes)
 
-dnl ***************************************************************************
-dnl *** Mini-Commander specific checks                                      ***
-dnl ***************************************************************************
-AC_ARG_ENABLE(mini-commander, [  --enable-mini-commander build mini-commander
-                          [@<:@default: no, transparent upgrade to deskbar-applet@:>@]],, 
enable_mini_commander="no")
-AM_CONDITIONAL(BUILD_MINICOMMANDER_APPLET, test "x$enable_mini_commander" = "xyes")
-
 dnl ***************************************************************************
 dnl *** Stickynotes specific checks                                         ***
 dnl ***************************************************************************
@@ -675,7 +668,7 @@ echo "    drivemount ....................: always"
 echo "    geyes .........................: always"
 echo "    gweather ......................: $build_libgweather_applets"
 echo "    inhibit .......................: always"
-echo "    mini-commander ................: $enable_mini_commander"
+echo "    mini-commander ................: always"
 echo "    multiload .....................: $build_gtop_applets"
 echo "    netspeed ......................: $build_gtop_applets"
 echo "    sticky-notes ..................: $enable_stickynotes"
diff --git a/help/Makefile.am b/help/Makefile.am
index 3d7d79d59..ef46a59d7 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -4,6 +4,7 @@ SUBDIRS = \
        charpick \
        drivemount \
        geyes \
+       mini-commander \
        sticky-notes \
        trash \
        $(NULL)
@@ -32,12 +33,6 @@ SUBDIRS += \
        $(NULL)
 endif
 
-if BUILD_MINICOMMANDER_APPLET
-SUBDIRS += \
-       mini-commander \
-       $(NULL)
-endif
-
 if BUILD_GTOP_APPLETS
 SUBDIRS += \
        multiload \
diff --git a/mini-commander/Makefile.am b/mini-commander/Makefile.am
index b5056f323..795cb746c 100644
--- a/mini-commander/Makefile.am
+++ b/mini-commander/Makefile.am
@@ -1,9 +1,3 @@
-## Process this file with automake to produce Makefile.in
-
-DIST_SUBDIRS = src
-
-if BUILD_MINICOMMANDER_APPLET
 SUBDIRS = src
-endif
 
 -include $(top_srcdir)/git.mk