diff options
| author | Max Kellermann <max@duempel.org> | 2008-12-10 19:55:37 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-12-10 19:55:37 +0100 |
| commit | de82a840d22c418351036c09a7fb466d1ffb4efd (patch) | |
| tree | 30f9427206a123dd4e5b5e0084e52a536c877407 /src | |
| parent | af8b511c67840ce2baa18c5cfe3abff9639c5ed1 (diff) | |
| download | mpd-de82a840d22c418351036c09a7fb466d1ffb4efd.tar.gz mpd-de82a840d22c418351036c09a7fb466d1ffb4efd.tar.xz mpd-de82a840d22c418351036c09a7fb466d1ffb4efd.zip | |
hscroll: don't compile source in ncmpc-mini mode
This source is not required with --enable-mini.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/hscroll.c | 5 | ||||
| -rw-r--r-- | src/hscroll.h | 6 | ||||
| -rw-r--r-- | src/screen.c | 5 | ||||
| -rw-r--r-- | src/screen_play.c | 5 |
5 files changed, 11 insertions, 15 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 02c7dc8e8..f16e775b1 100644 --- 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 2915a112c..d3e47d8e1 100644 --- 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 47ace33dd..6b623fb1b 100644 --- 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 9c65e7812..f6b41c1d7 100644 --- 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 f8f65ba62..f48254c7a 100644 --- 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> |