aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Plugins/Extensions
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/Plugins/Extensions')
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/Makefile.am2
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/src/Makefile.am23
-rwxr-xr-xlib/python/Plugins/Extensions/Makefile.am6
-rw-r--r--lib/python/Plugins/Extensions/SocketMMI/src/Makefile.am23
4 files changed, 21 insertions, 33 deletions
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