From 4aec6c4fec83a87c1902036473e942ab29561a53 Mon Sep 17 00:00:00 2001
From: "[CST] Bas" <bas@coolstreamtech.com>
Date: Sun, 4 Mar 2012 15:53:33 +0800
Subject: [PATCH] lib: fix compile after include change.

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/b04b3f270a9b46e24a62092dd36525dfdf3ad519
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-03-04 (Sun, 04 Mar 2012)


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

------------------
This commit was generated by Migit
---
 lib/libdvbsub/Makefile.am    |  5 +++--
 lib/libmd5sum/Makefile.am    |  2 ++
 lib/libmd5sum/libmd5sum.c    | 13 ++++++-------
 lib/libtuxtxt/Makefile.am    |  3 ++-
 lib/xmltree/Makefile.am      |  4 +++-
 lib/xmltree/xmlinterface.cpp |  2 +-
 lib/xmltree/xmlinterface.h   |  2 +-
 7 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/lib/libdvbsub/Makefile.am b/lib/libdvbsub/Makefile.am
index b27821edb..6d9c9c0b3 100644
--- a/lib/libdvbsub/Makefile.am
+++ b/lib/libdvbsub/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
-	-I$(top_srcdir)/src/zapit/include \
-	-I$(top_srcdir)/src
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include
 
 if BOXTYPE_COOL
 INCLUDES += -I$(top_srcdir)/lib/libcoolstream
diff --git a/lib/libmd5sum/Makefile.am b/lib/libmd5sum/Makefile.am
index 58b5fea8f..761a1cb39 100644
--- a/lib/libmd5sum/Makefile.am
+++ b/lib/libmd5sum/Makefile.am
@@ -5,5 +5,7 @@ noinst_LIBRARIES = libtuxbox-md5sum.a
 
 AM_CPPFLAGS = 
 
+INCLUDES = \
+	-I$(top_srcdir)
 
 libtuxbox_md5sum_a_SOURCES = libmd5sum.c md5.c
diff --git a/lib/libmd5sum/libmd5sum.c b/lib/libmd5sum/libmd5sum.c
index f6894d495..784861f43 100644
--- a/lib/libmd5sum/libmd5sum.c
+++ b/lib/libmd5sum/libmd5sum.c
@@ -1,16 +1,15 @@
-#include "libmd5sum.h"
-#include <sys/types.h>
-#include <error.h>
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
-
-#include "md5.h"
-#include "getline.h"
+#include <sys/types.h>
+#include <error.h>
 #include <errno.h>
 #include <string.h>
 
+#include "libmd5sum.h"
+#include "md5.h"
+#include "getline.h"
+
 #define STREQ(a, b) (strcmp ((a), (b)) == 0)
 
 static int have_read_stdin;
diff --git a/lib/libtuxtxt/Makefile.am b/lib/libtuxtxt/Makefile.am
index c3852770d..69fc22c9e 100644
--- a/lib/libtuxtxt/Makefile.am
+++ b/lib/libtuxtxt/Makefile.am
@@ -1,6 +1,7 @@
 INCLUDES = \
-        -I$(top_srcdir)/src/zapit/include \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/zapit/include \
 	$(FREETYPE_CFLAGS)
 
 if BOXTYPE_COOL
diff --git a/lib/xmltree/Makefile.am b/lib/xmltree/Makefile.am
index fc2d4201e..fa4f24e76 100644
--- a/lib/xmltree/Makefile.am
+++ b/lib/xmltree/Makefile.am
@@ -1,4 +1,6 @@
-INCLUDES = -I$(srcdir)/xmltok
+INCLUDES = \
+	-I$(top_srcdir) \
+	-I$(srcdir)\xmltok
 
 AM_CXXFLAGS = -fno-rtti -fno-exceptions
 
diff --git a/lib/xmltree/xmlinterface.cpp b/lib/xmltree/xmlinterface.cpp
index 2b118ebf2..c2cd7493e 100644
--- a/lib/xmltree/xmlinterface.cpp
+++ b/lib/xmltree/xmlinterface.cpp
@@ -40,7 +40,7 @@
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
 #else  /* USE_LIBXML */
-#include <xmltok.h>
+#include "xmltok.h"
 #endif /* USE_LIBXML */
 
 
diff --git a/lib/xmltree/xmlinterface.h b/lib/xmltree/xmlinterface.h
index 037731815..97d7b8325 100644
--- a/lib/xmltree/xmlinterface.h
+++ b/lib/xmltree/xmlinterface.h
@@ -33,7 +33,7 @@
 #define __xmlinterface_h__
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string>