move glcd sources to one single place in driver/glcd

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2762c07622
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-21 (Sun, 21 Jun 2020)

Origin message was:
------------------
- move glcd sources to one single place in driver/glcd

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

configure.ac

@@ -441,6 +441,7 @@ src/Makefile
 src/daemonc/Makefile
 src/driver/Makefile
 src/driver/audiodec/Makefile
+src/driver/glcd/Makefile
 src/driver/pictureviewer/Makefile
 src/eitd/Makefile
 src/gui/Makefile

src/Makefile.am

@@ -132,7 +132,9 @@ neutrino_LDADD = \
 	-lz
 
 if ENABLE_GRAPHLCD
-neutrino_LDADD += -lglcddrivers -lglcdgraphics -lusb-1.0
+neutrino_LDADD += \
+	driver/glcd/libneutrino_driver_glcd.a \
+	-lglcddrivers -lglcdgraphics -lusb-1.0
 endif
 
 if ENABLE_GIFLIB

src/driver/Makefile.am

@@ -2,6 +2,10 @@ AM_CXXFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
 
 SUBDIRS = pictureviewer audiodec
 
+if ENABLE_GRAPHLCD
+SUBDIRS += glcd
+endif
+
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
@@ -48,17 +52,6 @@ libneutrino_driver_a_SOURCES = \
 	streamts.cpp \
 	volume.cpp
 
-if ENABLE_GRAPHLCD
-libneutrino_driver_a_SOURCES += \
-	analogclock.cpp \
-	digitalclock.cpp \
-	lcdclock.cpp \
-	ledclock.cpp \
-	simpleclock.cpp \
-	weather.cpp \
-	glcd.cpp
-endif
-
 if BOXTYPE_COOL
 libneutrino_driver_a_SOURCES += \
 	fb_accel_cs_hdx.cpp

src/driver/display.h

@@ -9,5 +9,5 @@
 #include <driver/simple_display.h>
 #endif
 #ifdef ENABLE_GRAPHLCD
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #endif

src/driver/glcd/Makefile.am

@@ -0,0 +1,25 @@
+AM_CXXFLAGS = -fno-rtti -fno-exceptions
+
+AM_CPPFLAGS = \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/lib/libconfigfile \
+	-I$(top_srcdir)/lib/libeventserver \
+	@SIGC_CFLAGS@ \
+	@FREETYPE_CFLAGS@ \
+	@LUA_CFLAGS@ \
+	@HWLIB_CFLAGS@
+
+noinst_LIBRARIES = libneutrino_driver_glcd.a
+
+libneutrino_driver_glcd_a_SOURCES = \
+	analogclock.cpp \
+	digitalclock.cpp \
+	lcdclock.cpp \
+	ledclock.cpp \
+	simpleclock.cpp \
+	weather.cpp \
+	glcd.cpp

src/driver/glcd/analogclock.cpp

@@ -28,7 +28,7 @@
 #include <neutrino.h>
 #include <math.h>
 #include <cstdio>
-#include <driver/analogclock.h>
+#include "analogclock.h"
 #include <system/helpers.h>
 
 enum files

src/driver/glcd/digitalclock.cpp

@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/digitalclock.h>
+#include "digitalclock.h"
 #include <system/helpers.h>
 
 #include <driver/pictureviewer/pictureviewer.h>

src/driver/glcd/glcd.cpp

@@ -35,10 +35,10 @@
 #include <gui/movieplayer.h>
 #include <driver/pictureviewer/pictureviewer.h>
 #include <hardware_caps.h>
-#include <driver/glcd.h>
 #include <eitd/sectionsd.h>
 #include <math.h>
 
+#include "glcd.h"
 #include "analogclock.h"
 #include "digitalclock.h"
 #include "lcdclock.h"

src/driver/glcd/lcdclock.cpp

@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/lcdclock.h>
+#include "lcdclock.h"
 
 static bool fonts_initialized = false;
 

src/driver/glcd/ledclock.cpp

@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/ledclock.h>
+#include "ledclock.h"
 
 static bool fonts_initialized = false;
 

src/driver/glcd/simpleclock.cpp

@@ -27,7 +27,7 @@
 #include <global.h>
 #include <neutrino.h>
 #include <cstdio>
-#include <driver/simpleclock.h>
+#include "simpleclock.h"
 
 static bool fonts_initialized = false;
 

src/driver/glcd/weather.cpp

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <cstdio>
-#include <driver/weather.h>
+#include "weather.h"
 #include <gui/weather.h>
 #include <system/helpers.h>
 

src/gui/glcdsetup.cpp

@@ -30,7 +30,7 @@
 #include <driver/fontrenderer.h>
 #include <driver/rcinput.h>
 #include <daemonc/remotecontrol.h>
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #include <driver/screen_max.h>
 #include <system/helpers.h>
 #include "glcdsetup.h"

src/gui/glcdsetup.h

@@ -29,7 +29,7 @@
 #include <string.h>
 #include <system/setting_helpers.h>
 #include <system/settings.h>
-#include <driver/glcd.h>
+#include <driver/glcd/glcd.h>
 #include <gui/widget/menue.h>
 
 class GLCD_Menu : public CMenuTarget, public CChangeObserver