hscroll: don't compile source in ncmpc-mini mode

This source is not required with --enable-mini.

diff --git a/src/Makefile.am b/src/Makefile.am
index 02c7dc8e898d8b72917d570bff254575e8ce2ff1..f16e775b18f29bcfaf486b56cb8ab2ab08d682ef 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,7 +66,6 @@ ncmpc_SOURCES = \
   screen_file.c\
   list_window.c\
   colors.c\
-       hscroll.c \
        charset.c \
        match.c \
   wreadln.c\
@@ -76,7 +75,9 @@ ncmpc_SOURCES = \
 
 if NCMPC_MINI
 else
-ncmpc_SOURCES += conf.c
+ncmpc_SOURCES += \
+       hscroll.c \
+       conf.c
 endif
 
 if ENABLE_HELP_SCREEN

diff --git a/src/hscroll.c b/src/hscroll.c
index 2915a112ca93299984d2c57429abb5b714374d35..d3e47d8e1d9e12a98634340cb0d03b58eaa529f4 100644 (file)
--- a/src/hscroll.c
+++ b/src/hscroll.c
@@ -18,14 +18,11 @@
 
 #include "hscroll.h"
 #include "charset.h"
-#include "config.h"
 
 #include <assert.h>
 #include <ctype.h>
 #include <string.h>
 
-#ifndef NCMPC_MINI
-
 // FIXME: utf-8 length
 char *
 strscroll(char *str, char *separator, int width, scroll_state_t *st)
@@ -73,5 +70,3 @@ strscroll(char *str, char *separator, int width, scroll_state_t *st)
        g_free(tmp);
        return buf;
 }
-
-#endif

diff --git a/src/hscroll.h b/src/hscroll.h
index 47ace33dd49d685758bdfc7373edd517d31e6951..6b623fb1b77c018a910bce7c951897320e36be8d 100644 (file)
--- a/src/hscroll.h
+++ b/src/hscroll.h
@@ -20,12 +20,8 @@
 #ifndef HSCROLL_H
 #define HSCROLL_H
 
-#include "config.h"
-
 #include <glib.h>
 
-#ifndef NCMPC_MINI
-
 typedef struct {
        gsize offset;
        GTime t; /* GTime is equivalent to time_t */
@@ -34,5 +30,3 @@ typedef struct {
 char *strscroll(char *str, char *separator, int width, scroll_state_t *st);
 
 #endif
-
-#endif

diff --git a/src/screen.c b/src/screen.c
index 9c65e781236751e835ce728b727cc8a3eeb63cb0..f6b41c1d72281321c91585f466617d810f20aa38 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -21,7 +21,6 @@
 #include "screen_utils.h"
 #include "config.h"
 #include "i18n.h"
-#include "hscroll.h"
 #include "charset.h"
 #include "mpdclient.h"
 #include "utils.h"
@@ -29,6 +28,10 @@
 #include "colors.h"
 #include "strfsong.h"
 
+#ifndef NCMPC_MINI
+#include "hscroll.h"
+#endif
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdarg.h>

diff --git a/src/screen_play.c b/src/screen_play.c
index f8f65ba6255a9b1a8e1c4b446e5eb15a4e66ad9c..f48254c7ae686b3fe810abefceb1b305db8d4266 100644 (file)
--- a/src/screen_play.c
+++ b/src/screen_play.c
@@ -20,7 +20,6 @@
 #include "i18n.h"
 #include "charset.h"
 #include "options.h"
-#include "hscroll.h"
 #include "mpdclient.h"
 #include "utils.h"
 #include "strfsong.h"
@@ -31,6 +30,10 @@
 #include "screen_utils.h"
 #include "screen_play.h"
 
+#ifndef NCMPC_MINI
+#include "hscroll.h"
+#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>