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

20 files changed, 93 insertions, 55 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index bd89aeef..f5617486 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1,18 @@
 SUBDIRS = actions base components dvb dvb_ci gdi service driver nav gui python mmi
+
+noinst_LTLIBRARIES = libenigma.la
+
+libenigma_la_SOURCES =
+libenigma_la_LIBADD = \
+	$(top_builddir)/lib/actions/libenigma_actions.la \
+	$(top_builddir)/lib/base/libenigma_base.la \
+	$(top_builddir)/lib/components/libenigma_components.la \
+	$(top_builddir)/lib/driver/libenigma_driver.la \
+	$(top_builddir)/lib/mmi/libenigma_mmi.la \
+	$(top_builddir)/lib/dvb/libenigma_dvb.la \
+	$(top_builddir)/lib/dvb_ci/libenigma_dvb_ci.la \
+	$(top_builddir)/lib/gdi/libenigma_gdi.la \
+	$(top_builddir)/lib/gui/libenigma_gui.la \
+	$(top_builddir)/lib/python/libenigma_python.la \
+	$(top_builddir)/lib/nav/libenigma_nav.la \
+	$(top_builddir)/lib/service/libenigma_service.la
diff --git a/lib/actions/Makefile.am b/lib/actions/Makefile.am
index 05a50884..45f0177b 100644
--- a/lib/actions/Makefile.am
+++ b/lib/actions/Makefile.am
@@ -1,15 +1,21 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_builddir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_actions.a
+EXTRA_DIST = parseactions.py
 
-libenigma_actions_a_SOURCES = \
-	action.cpp 
+noinst_LTLIBRARIES = libenigma_actions.la
 
+libenigma_actions_la_SOURCES = \
+	action.cpp \
+	action.h
+
+BUILT_SOURCES = actionids.h
 CLEANFILES = actionids.h
 
 action.cpp: actionids.h
 
-actionids.h:
-	 python ./parseactions.py include ../gui/*.h > actionids.h
-	 python ./parseactions.py parse ../gui/*.h >> actionids.h
+actionids.h: $(top_srcdir)/lib/gui/*.h
+	$(PYTHON) $(srcdir)/parseactions.py include $(top_srcdir)/lib/gui/*.h > $@
+	$(PYTHON) $(srcdir)/parseactions.py parse $(top_srcdir)/lib/gui/*.h >> $@
diff --git a/lib/actions/action.h b/lib/actions/action.h
index cbf5370a..edcfac6f 100644
--- a/lib/actions/action.h
+++ b/lib/actions/action.h
@@ -3,10 +3,6 @@
 
 #include <lib/base/object.h>
 
-		/* avoid warnigs :) */
-#include <features.h>
-#undef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 200112L
 #include <lib/python/python.h>
 #include <string>
 #include <map>
diff --git a/lib/actions/parseactions.py b/lib/actions/parseactions.py
index 2462a751..cad432a7 100644
--- a/lib/actions/parseactions.py
+++ b/lib/actions/parseactions.py
@@ -89,7 +89,7 @@ def do_file(f, mode):
 
 						if mode == "include":
 							# hack hack hack!!
-							print "#include <lib" + f[2:] + ">"
+							print "#include <lib/" + '/'.join(f.split('/')[-2:]) + ">"
 						else:
 							print "\t// " + f
 
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index df6d2b85..5fd3eaf2 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -1,9 +1,11 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_base.a
+noinst_LTLIBRARIES = libenigma_base.la
 
-libenigma_base_a_SOURCES = \
+libenigma_base_la_SOURCES = \
 	buffer.cpp ebase.cpp eerror.cpp elock.cpp \
 	init.cpp message.cpp thread.cpp \
 	smartptr.cpp estring.cpp connection.cpp \
diff --git a/lib/base/console.h b/lib/base/console.h
index e730b40e..60540da0 100644
--- a/lib/base/console.h
+++ b/lib/base/console.h
@@ -1,7 +1,6 @@
 #ifndef __LIB_BASE_CONSOLE_H__
 #define __LIB_BASE_CONSOLE_H__
 
-#include "Python.h"
 #include <string>
 #include <lib/base/ebase.h>
 #include <lib/python/connections.h>
diff --git a/lib/components/Makefile.am b/lib/components/Makefile.am
index e6d21d7a..960e101c 100644
--- a/lib/components/Makefile.am
+++ b/lib/components/Makefile.am
@@ -1,6 +1,8 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_components.a
+noinst_LTLIBRARIES = libenigma_components.la
 
-libenigma_components_a_SOURCES = scan.cpp file_eraser.cpp
+libenigma_components_la_SOURCES = scan.cpp file_eraser.cpp
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index 244c1324..4b8fc086 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -1,7 +1,9 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_driver.a
+noinst_LTLIBRARIES = libenigma_driver.la
 
-libenigma_driver_a_SOURCES = \
+libenigma_driver_la_SOURCES = \
 	rc.cpp rcinput.cpp rcconsole.cpp avswitch.cpp rfmod.cpp etimezone.cpp misc_options.cpp
diff --git a/lib/dvb/Makefile.am b/lib/dvb/Makefile.am
index ee81c216..cef71405 100644
--- a/lib/dvb/Makefile.am
+++ b/lib/dvb/Makefile.am
@@ -1,11 +1,13 @@
 SUBDIRS = lowlevel
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_dvb.a
+noinst_LTLIBRARIES = libenigma_dvb.la
 
-libenigma_dvb_a_SOURCES = dvb.cpp demux.cpp frontend.cpp esection.cpp db.cpp \
+libenigma_dvb_la_SOURCES = dvb.cpp demux.cpp frontend.cpp esection.cpp db.cpp \
 	sec.cpp scan.cpp crc32.cpp pmt.cpp decoder.cpp eit.cpp rotor_calc.cpp \
 	epgcache.cpp dvbtime.cpp metaparser.cpp volume.cpp tstools.cpp pvrparse.cpp \
 	pesparse.cpp teletext.cpp radiotext.cpp subtitle.cpp
diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am
index e98636e0..153f8c0b 100644
--- a/lib/dvb_ci/Makefile.am
+++ b/lib/dvb_ci/Makefile.am
@@ -1,9 +1,11 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_dvb_ci.a
+noinst_LTLIBRARIES = libenigma_dvb_ci.la
 
-libenigma_dvb_ci_a_SOURCES = dvbci.cpp dvbci_session.cpp dvbci_resmgr.cpp \
+libenigma_dvb_ci_la_SOURCES = dvbci.cpp dvbci_session.cpp dvbci_resmgr.cpp \
 														 dvbci_appmgr.cpp dvbci_camgr.cpp \
 														 dvbci_datetimemgr.cpp dvbci_mmi.cpp \
 														 dvbci_ui.cpp
diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am
index 192a96f6..192990b9 100644
--- a/lib/gdi/Makefile.am
+++ b/lib/gdi/Makefile.am
@@ -1,15 +1,15 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include -I$(top_srcdir)/lib/gdi/ati
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_gdi.a
+noinst_LTLIBRARIES = libenigma_gdi.la
 
-libenigma_gdi_a_SOURCES = \
+libenigma_gdi_la_SOURCES = \
 	region.cpp grc.cpp epng.cpp erect.cpp fb.cpp font.cpp font_arabic.cpp gfbdc.cpp  \
 	glcddc.cpp gpixmap.cpp lcd.cpp gfont.cpp accel.cpp picload.cpp picexif.cpp \
 	compositing.cpp bcm.cpp
 
 if WITH_SDL
-libenigma_gdi_a_SOURCES += sdl.cpp
+libenigma_gdi_la_SOURCES += sdl.cpp
 endif
-
-#	ati/2dablt.cpp ati/2dcore.cpp ati/ati_core.cpp ati/test.cpp ati/2dutil.cpp
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index 8293b2e2..290eaab9 100644
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -1,10 +1,11 @@
 AM_CPPFLAGS = \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_gui.a
+noinst_LTLIBRARIES = libenigma_gui.la
 
-libenigma_gui_a_SOURCES = \
+libenigma_gui_la_SOURCES = \
 	ebutton.cpp elabel.cpp eslider.cpp ewidget.cpp ewidgetdesktop.cpp  \
 	ewindow.cpp ewindowstyle.cpp elistbox.cpp elistboxcontent.cpp \
 	epixmap.cpp ewindowstyleskinned.cpp einput.cpp einputstring.cpp einputnumber.cpp \
diff --git a/lib/mmi/Makefile.am b/lib/mmi/Makefile.am
index 4a514fce..f72d1586 100644
--- a/lib/mmi/Makefile.am
+++ b/lib/mmi/Makefile.am
@@ -1,6 +1,8 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_mmi.a
+noinst_LTLIBRARIES = libenigma_mmi.la
 
-libenigma_mmi_a_SOURCES = mmi_ui.cpp
+libenigma_mmi_la_SOURCES = mmi_ui.cpp
diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am
index 28adfe6b..93468699 100644
--- a/lib/nav/Makefile.am
+++ b/lib/nav/Makefile.am
@@ -1,9 +1,11 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_nav.a
+noinst_LTLIBRARIES = libenigma_nav.la
 
-libenigma_nav_a_SOURCES = \
+libenigma_nav_la_SOURCES = \
 	core.cpp pcore.cpp
 
 
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>
 
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am
index 52d7af2a..c4dabebc 100644
--- a/lib/service/Makefile.am
+++ b/lib/service/Makefile.am
@@ -1,9 +1,11 @@
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/include
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
+	-include Python.h
 
-noinst_LIBRARIES = libenigma_service.a
+noinst_LTLIBRARIES = libenigma_service.la
 
-libenigma_service_a_SOURCES = \
+libenigma_service_la_SOURCES = \
 	listboxservice.cpp service.cpp servicemp3.cpp servicedvb.cpp servicefs.cpp \
 	event.cpp servicedvbrecord.cpp