Fix the obvious build problems
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 15:53:46 +0000 (16:53 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 18 Dec 2010 15:53:46 +0000 (16:53 +0100)
lib/network/Makefile.am
lib/network/http.cpp
lib/network/http.h
lib/network/httpd.cpp
main/Makefile.am

index 73b5a3e..385bb6a 100644 (file)
@@ -1,5 +1,7 @@
-INCLUDES = \
-       -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/include \
+       -include Python.h
 
 noinst_LTLIBRARIES = libenigma_network.la
 
index dc98a0b..6a6f45a 100644 (file)
@@ -1,6 +1,6 @@
 #include <lib/base/init_num.h>
 #include <lib/base/init.h>
-#include <lib/network/http.h>
+#include "http.h"
 
 eHTTPServer *eHTTPServer::m_instance;
 
index fa2a4fb..1dbd853 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef __http_h
 #define __http_h
 
-#include <lib/network/httpd.h>
-#include <lib/network/http_file.h>
-#include <lib/network/http_dyn.h>
+#include "httpd.h"
+#include "http_file.h"
+#include "http_dyn.h"
 
 class eHTTPDynPathResolver;
 class eHTTPFilePathResolver;
index c89ad7e..3ccae92 100644 (file)
@@ -1,5 +1,5 @@
 // #define DEBUG_HTTPD
-#include <lib/network/httpd.h>
+#include "httpd.h"
 
 #include <sys/socket.h>
 #include <lib/base/smartptr.h>
@@ -9,8 +9,8 @@
 #include <time.h>
 #include <ctype.h>
 
-#include <lib/network/http_dyn.h>
-#include <lib/network/http_file.h>
+#include "http_dyn.h"
+#include "http_file.h"
 
 eHTTPDataSource::eHTTPDataSource(eHTTPConnection *c): connection(c)
 {
index 4eebe99..629d62a 100644 (file)
@@ -48,4 +48,6 @@ enigma2_LDADD = \
        @LIBXINE_LIBS@ \
        @PTHREAD_LIBS@ \
        @SDL_LIBS@ \
-       @LIBS@
+       @LIBS@ \
+       -ltuxtxt32bpp
+