CComponents: move class into its own source directory

The components could over time become quite large,
so it makes more sense, coming features to split into
multiple files and to do it in a separate directory.

configure.ac

@@ -191,6 +191,7 @@ src/driver/audiodec/Makefile
 src/driver/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
+src/gui/components/Makefile
 src/gui/widget/Makefile
 src/system/Makefile
 data/Makefile

src/Makefile.am

@@ -56,6 +56,7 @@ endif
 neutrino_LDADD = \
 	daemonc/libneutrino_daemonc.a \
 	gui/bedit/libneutrino_gui_bedit.a \
+	gui/components/libneutrino_gui_components.a \
 	gui/libtimerlist.a \
 	gui/libneutrino_gui.a \
 	gui/widget/libneutrino_gui_widget.a \

src/gui/Makefile.am

@@ -18,7 +18,7 @@ noinst_HEADERS = git_version.h
 .PHONY: makeversion
 
 
-SUBDIRS = widget bedit
+SUBDIRS = bedit components widget
 
 INCLUDES = \
 	-I$(top_builddir) \

src/gui/audioplayer.h

@@ -37,7 +37,7 @@
 #include <driver/framebuffer.h>
 #include <driver/audiofile.h>
 #include <gui/filebrowser.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <gui/widget/menue.h>
 
 #include <xmltree/xmlinterface.h>

src/gui/bedit/bouqueteditor_channels.h

@@ -35,7 +35,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>

src/gui/bedit/bouqueteditor_chanselect.h

@@ -34,7 +34,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/listbox.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <zapit/client/zapitclient.h>
 
 #include <string>

src/gui/channellist.cpp

@@ -55,7 +55,7 @@
 #include <gui/widget/icons.h>
 #include <gui/widget/messagebox.h>
 #include <gui/widget/progressbar.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 
 #include <system/settings.h>
 #include <gui/customcolor.h>

src/gui/components/Makefile.am

@@ -0,0 +1,28 @@
+AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
+
+INCLUDES = \
+	-I$(top_builddir) \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir)/lib \
+	-I$(top_srcdir)/lib/libnet \
+	-I$(top_srcdir)/lib/libconfigfile \
+	@FREETYPE_CFLAGS@
+
+if BOXTYPE_COOL
+INCLUDES += -I$(top_srcdir)/lib/libcoolstream
+endif
+if USE_STB_HAL
+INCLUDES += -I$(STB_HAL_INC)
+else
+if BOXTYPE_TRIPLE
+INCLUDES += -I$(top_srcdir)/lib/libtriple
+endif
+endif
+
+noinst_LIBRARIES = libneutrino_gui_components.a
+
+
+libneutrino_gui_components_a_SOURCES = \
+	components.cpp

src/gui/components/cc.h

@@ -1,7 +1,7 @@
 /*
 	GUI window component classes - Neutrino-GUI
 
-	Copyright(C) 2012, Thilo Graf (dbt)
+	Copyright(C) 2012, 2013, Thilo Graf
 
 	This class contains generic components for GUI-related parts.
 

src/gui/components/components.cpp

@@ -1,7 +1,8 @@
 /*
 	GUI window component classes - Neutrino-GUI
 
-	Copyright(C) 2012, Thilo Graf (dbt)
+	Copyright(C) 2012, 2013, Thilo Graf
+	Copyright(C) 2012, Michael Liebmann
 
 	This class contains generic components for GUI-related parts.
 
@@ -29,7 +30,7 @@
 
 #include <global.h>
 #include <neutrino.h>
-#include <gui/widget/components.h>
+#include "cc.h"
 
 
 

src/gui/widget/Makefile.am

@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -fno-rtti -fno-exceptions
+AM_CPPFLAGS = -fno-rtti -fno-exceptions -D__STDC_FORMAT_MACROS
 
 INCLUDES = \
 	-I$(top_builddir) \
@@ -26,7 +26,6 @@ noinst_LIBRARIES = libneutrino_gui_widget.a libneutrino_gui_widget2.a
 libneutrino_gui_widget_a_SOURCES = \
 	buttons.cpp \
 	colorchooser.cpp \
-	components.cpp \
 	drawable.cpp \
 	helpbox.cpp \
 	hintbox.cpp \

src/gui/widget/menue.h

@@ -41,7 +41,7 @@
 #include <system/localize.h>
 #include <gui/widget/icons.h>
 #include <gui/color.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 
 #include <string>
 #include <vector>