9 files changed, 53 insertions, 40 deletions
diff --git a/lib/actions/Makefile.am b/lib/actions/Makefile.am
index 9f62e2e7..83f57d3d 100644
--- a/lib/actions/Makefile.am
+++ b/lib/actions/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
+	-I$(top_srcdir) \
 	-I$(top_srcdir)/include \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am
index f1f69ef5..5f2aee9b 100644
--- a/lib/gdi/Makefile.am
+++ b/lib/gdi/Makefile.am
@@ -4,6 +4,9 @@ AM_CPPFLAGS = \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
 
+AM_CXXFLAGS = \
+	$(LIBSDL_CFLAGS)
+
 noinst_LTLIBRARIES = libenigma_gdi.la
 
 libenigma_gdi_la_SOURCES = \
@@ -42,7 +45,7 @@ libenigma_gdi_la_SOURCES = \
 	region.cpp \
 	region.h
 
-if WITH_SDL
+if HAVE_LIBSDL
 libenigma_gdi_la_SOURCES += \
 	sdl.cpp \
 	sdl.h
diff --git a/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am b/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
index 3ccca98e..4828081f 100644
--- a/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
+++ b/lib/python/Plugins/DemoPlugins/TPMDemo/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/DemoPlugins/TPMDemo
+installdir = $(pkglibdir)/python/Plugins/DemoPlugins/TPMDemo
 
 install_PYTHON = \
 	__init__.py \
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
index 71ea7142..ec212e47 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/Makefile.am
@@ -1,4 +1,3 @@
-if HAVE_DDVDLIB
 SUBDIRS = src meta
 
 installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
@@ -8,4 +7,3 @@ install_PYTHON = \
 	plugin.py \
 	keymap.xml \
 	LICENSE
-endif
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
index 5bfc8afa..7aaec9bb 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am
@@ -1,22 +1,15 @@
-CPPFLAGS += \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
 
-OBJS = servicedvd.cpp
+plugindir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
 
--include $(OBJS:.cpp=.d)
+plugin_LTLIBRARIES = servicedvd.la
 
-installdir = $(pkglibdir)/python/Plugins/Extensions/DVDPlayer
+servicedvd_la_SOURCES = \
+	servicedvd.cpp \
+	servicedvd.h
 
-install_PYTHON = \
-	servicedvd.so
-
-servicedvd.so:
-	$(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \
-	-Wall -W $(OBJS) -shared -fPIC -Wl,-soname,servicedvd.so -o servicedvd.so \
-	$(LDFLAGS) -ldreamdvd
-
-all: servicedvd.so
-
-CLEANFILES = servicedvd.so servicedvd.d
+servicedvd_la_LDFLAGS = -avoid-version -module
diff --git a/lib/python/Plugins/Extensions/Makefile.am b/lib/python/Plugins/Extensions/Makefile.am
index 5a6e3f3a..7a3a9be2 100755
--- a/lib/python/Plugins/Extensions/Makefile.am
+++ b/lib/python/Plugins/Extensions/Makefile.am
@@ -1,6 +1,10 @@
 installdir = $(pkglibdir)/python/Plugins/Extensions
 
-SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDPlayer DVDBurn Modem
+SUBDIRS = TuxboxPlugins CutListEditor PicturePlayer MediaScanner MediaPlayer GraphMultiEPG SocketMMI DVDBurn Modem
+
+if HAVE_LIBDDVD
+SUBDIRS += DVDPlayer
+endif
 
 install_PYTHON =	\
 	__init__.py
diff --git a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
index 9fb72097..5ce7d031 100644
--- a/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
+++ b/lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am
@@ -1,22 +1,15 @@
-CPPFLAGS += \
+AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	-I$(top_srcdir)/include \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
 
-OBJS = socket_mmi.cpp
+plugindir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI
 
--include $(OBJS:.cpp=.d)
+plugin_LTLIBRARIES = socketmmi.la
 
-installdir = $(pkglibdir)/python/Plugins/Extensions/SocketMMI
+socketmmi_la_SOURCES = \
+	socket_mmi.cpp \
+	socket_mmi.h
 
-install_PYTHON = \
-	socketmmi.so
-
-socketmmi.so: socket_mmi.cpp socket_mmi.h
-	$(CXX) $(CPPFLAGS) -MD $(CXXFLAGS) $(DEFS) -I$(top_srcdir)/include \
-	-Wall -W $(OBJS) -shared -fPIC -Wl,-soname,socketmmi.so -o socketmmi.so \
-	$(LDFLAGS)
-
-all: socketmmi.so
-
-CLEANFILES = socketmmi.so socketmmi.d
+socketmmi_la_LDFLAGS = -avoid-version -module
diff --git a/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
index cfdeb654..490a7720 100755
--- a/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
+++ b/lib/python/Plugins/SystemPlugins/TempFanControl/Makefile.am
@@ -1,4 +1,4 @@
-installdir = $(LIBDIR)/enigma2/python/Plugins/SystemPlugins/TempFanControl
+installdir = $(pkglibdir)/python/Plugins/SystemPlugins/TempFanControl
 
 SUBDIRS = meta
 
@@ -6,4 +6,4 @@ install_PYTHON = \
 	__init__.py \
 	plugin.py
 
-dist_install_DATA = LICENSE
-\ No newline at end of file
+dist_install_DATA = LICENSE
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am
index 78d9b646..18c012a5 100644
--- a/lib/service/Makefile.am
+++ b/lib/service/Makefile.am
@@ -4,9 +4,30 @@ AM_CPPFLAGS = \
 	-include Python.h \
 	-include $(top_builddir)/enigma2_config.h
 
+AM_CXXFLAGS = \
+	$(LIBXINE_CFLAGS)
+
 noinst_LTLIBRARIES = libenigma_service.la
 
 libenigma_service_la_SOURCES = \
-	listboxservice.cpp service.cpp servicemp3.cpp servicedvb.cpp servicefs.cpp \
-	event.cpp servicedvbrecord.cpp
-	
+	event.cpp \
+	event.h \
+	iservice.h \
+	listboxservice.cpp \
+	listboxservice.h \
+	service.cpp \
+	service.h \
+	servicedvb.cpp \
+	servicedvb.h \
+	servicedvbrecord.cpp \
+	servicedvbrecord.h \
+	servicefs.cpp \
+	servicefs.h \
+	servicemp3.cpp \
+	servicemp3.h
+
+if HAVE_LIBXINE
+libenigma_service_la_SOURCES += \
+	servicexine.cpp \
+	servicexine.h
+endif