From 97b86324d322309843cc5d9d93b039d706c5ae58 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 22 Oct 2010 16:10:02 +0000
Subject: clean up build

* reduce use of TUXBOX macros
* fix compiler warnings by including Python.h from the command-line
* use libtool to build and link main/* and lib/*
* don't link libmad, libid3tag, libcrypt, libresolv, librt, ldl into e2
* fix make rules of actionids.h
---
 lib/python/Makefile.am                                  | 7 ++++---
 lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am | 4 ++++
 lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am | 4 ++++
 lib/python/connections.h                                | 5 -----
 lib/python/python.h                                     | 1 -
 5 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'lib/python')

diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 72191edc..03dcedb9 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -1,12 +1,13 @@
 AM_CPPFLAGS = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src
+	-include Python.h
 
 SUBDIRS = Components Tools Screens Plugins
 
-noinst_LIBRARIES = libenigma_python.a
+noinst_LTLIBRARIES = libenigma_python.la
 
-libenigma_python_a_SOURCES = \
+libenigma_python_la_SOURCES = \
 	python.cpp enigma_python_wrap.cxx connections.cpp
 
 enigma_python_wrap.cxx: enigma_python.i
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
index fdd9c3ed..e79688b8 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
@@ -1,3 +1,7 @@
+CPPFLAGS += \
+	-I$(top_srcdir) \
+	-include Python.h
+
 OBJS = servicedvd.cpp
 
 -include $(OBJS:.cpp=.d)
diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
index 8e80e183..914371e5 100644
--- a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
@@ -1,3 +1,7 @@
+CPPFLAGS += \
+	-I$(top_srcdir) \
+	-include Python.h
+
 OBJS = socket_mmi.cpp
 
 -include $(OBJS:.cpp=.d)
diff --git a/lib/python/connections.h b/lib/python/connections.h
index ad76198a..b4cd1c79 100644
--- a/lib/python/connections.h
+++ b/lib/python/connections.h
@@ -3,11 +3,6 @@
 
 #include <libsig_comp.h>
 
-		/* avoid warnigs :) */
-#include <features.h>
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
-
 #include <lib/python/python.h>
 
 class PSignal
diff --git a/lib/python/python.h b/lib/python/python.h
index 18fdac78..f5b6e4d8 100644
--- a/lib/python/python.h
+++ b/lib/python/python.h
@@ -4,7 +4,6 @@
 	#define __lib_python_python_class_h
 #endif
 
-#include <Python.h>
 #include <string>
 #include <lib/base/object.h>
 
-- 
cgit v1.2.3