diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-10-21 23:07:32 +0000 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-16 17:15:37 +0100 |
| commit | ded9f8508f8d0723d84cc9f4bc7d234b69b829e0 (patch) | |
| tree | a0a801f9a3b126854aa460979e798d833ac7b93c /lib/python | |
| parent | 8e1bfdaeba295c6d5f29a306076492d7c70fd5b3 (diff) | |
| download | enigma2-ded9f8508f8d0723d84cc9f4bc7d234b69b829e0.tar.gz enigma2-ded9f8508f8d0723d84cc9f4bc7d234b69b829e0.zip | |
further updates to the build system, generate enigma2.sh
Diffstat (limited to 'lib/python')
6 files changed, 24 insertions, 36 deletions
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 |