aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am17
-rw-r--r--lib/actions/Makefile.am6
-rw-r--r--lib/base/Makefile.am4
-rw-r--r--lib/components/Makefile.am4
-rw-r--r--lib/driver/Makefile.am4
-rw-r--r--lib/dvb/Makefile.am4
-rw-r--r--lib/dvb_ci/Makefile.am4
-rw-r--r--lib/gdi/Makefile.am6
-rw-r--r--lib/gui/Makefile.am4
-rw-r--r--lib/mmi/Makefile.am4
-rw-r--r--lib/nav/Makefile.am4
-rw-r--r--lib/python/Makefile.am6
-rw-r--r--lib/service/Makefile.am6
13 files changed, 28 insertions, 45 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f5617486..bd89aeef 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,18 +1 @@
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 83f57d3d..75357868 100644
--- a/lib/actions/Makefile.am
+++ b/lib/actions/Makefile.am
@@ -7,13 +7,13 @@ AM_CPPFLAGS = \
EXTRA_DIST = parseactions.py
-noinst_LTLIBRARIES = libenigma_actions.la
+noinst_LIBRARIES = libenigma_actions.a
-libenigma_actions_la_SOURCES = \
+libenigma_actions_a_SOURCES = \
action.cpp \
action.h
-nodist_libenigma_actions_la_SOURCES = \
+nodist_libenigma_actions_a_SOURCES = \
actionids.h
BUILT_SOURCES = actionids.h
diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am
index 230a37ae..652ef9cd 100644
--- a/lib/base/Makefile.am
+++ b/lib/base/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_base.la
+noinst_LIBRARIES = libenigma_base.a
-libenigma_base_la_SOURCES = \
+libenigma_base_a_SOURCES = \
buffer.cpp \
buffer.h \
connection.cpp \
diff --git a/lib/components/Makefile.am b/lib/components/Makefile.am
index cef5890e..e873e525 100644
--- a/lib/components/Makefile.am
+++ b/lib/components/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_components.la
+noinst_LIBRARIES = libenigma_components.a
-libenigma_components_la_SOURCES = \
+libenigma_components_a_SOURCES = \
file_eraser.cpp \
file_eraser.h \
scan.cpp \
diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index 74d24fab..63a205a8 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_driver.la
+noinst_LIBRARIES = libenigma_driver.a
-libenigma_driver_la_SOURCES = \
+libenigma_driver_a_SOURCES = \
avswitch.cpp \
avswitch.h \
etimezone.cpp \
diff --git a/lib/dvb/Makefile.am b/lib/dvb/Makefile.am
index 91464982..74b43d0a 100644
--- a/lib/dvb/Makefile.am
+++ b/lib/dvb/Makefile.am
@@ -6,9 +6,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_dvb.la
+noinst_LIBRARIES = libenigma_dvb.a
-libenigma_dvb_la_SOURCES = \
+libenigma_dvb_a_SOURCES = \
crc32.cpp \
crc32.h \
db.cpp \
diff --git a/lib/dvb_ci/Makefile.am b/lib/dvb_ci/Makefile.am
index af839e73..c53c4da5 100644
--- a/lib/dvb_ci/Makefile.am
+++ b/lib/dvb_ci/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_dvb_ci.la
+noinst_LIBRARIES = libenigma_dvb_ci.a
-libenigma_dvb_ci_la_SOURCES = \
+libenigma_dvb_ci_a_SOURCES = \
dvbci.cpp \
dvbci.h \
dvbci_appmgr.cpp \
diff --git a/lib/gdi/Makefile.am b/lib/gdi/Makefile.am
index 5f2aee9b..a47855ff 100644
--- a/lib/gdi/Makefile.am
+++ b/lib/gdi/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS = \
AM_CXXFLAGS = \
$(LIBSDL_CFLAGS)
-noinst_LTLIBRARIES = libenigma_gdi.la
+noinst_LIBRARIES = libenigma_gdi.a
-libenigma_gdi_la_SOURCES = \
+libenigma_gdi_a_SOURCES = \
accel.cpp \
accel.h \
bcm.cpp \
@@ -46,7 +46,7 @@ libenigma_gdi_la_SOURCES = \
region.h
if HAVE_LIBSDL
-libenigma_gdi_la_SOURCES += \
+libenigma_gdi_a_SOURCES += \
sdl.cpp \
sdl.h
endif
diff --git a/lib/gui/Makefile.am b/lib/gui/Makefile.am
index 39c05d9a..30b00bfb 100644
--- a/lib/gui/Makefile.am
+++ b/lib/gui/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_gui.la
+noinst_LIBRARIES = libenigma_gui.a
-libenigma_gui_la_SOURCES = \
+libenigma_gui_a_SOURCES = \
ebutton.cpp \
ebutton.h \
ecanvas.cpp \
diff --git a/lib/mmi/Makefile.am b/lib/mmi/Makefile.am
index a082949d..9c821c97 100644
--- a/lib/mmi/Makefile.am
+++ b/lib/mmi/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_mmi.la
+noinst_LIBRARIES = libenigma_mmi.a
-libenigma_mmi_la_SOURCES = \
+libenigma_mmi_a_SOURCES = \
mmi_ui.cpp \
mmi_ui.h
diff --git a/lib/nav/Makefile.am b/lib/nav/Makefile.am
index c6d1c927..fc3dadc7 100644
--- a/lib/nav/Makefile.am
+++ b/lib/nav/Makefile.am
@@ -4,9 +4,9 @@ AM_CPPFLAGS = \
-include Python.h \
-include $(top_builddir)/enigma2_config.h
-noinst_LTLIBRARIES = libenigma_nav.la
+noinst_LIBRARIES = libenigma_nav.a
-libenigma_nav_la_SOURCES = \
+libenigma_nav_a_SOURCES = \
core.cpp \
core.h \
pcore.cpp \
diff --git a/lib/python/Makefile.am b/lib/python/Makefile.am
index 3c213a17..5cbda780 100644
--- a/lib/python/Makefile.am
+++ b/lib/python/Makefile.am
@@ -6,16 +6,16 @@ AM_CPPFLAGS = \
SUBDIRS = Components Tools Screens Plugins
-noinst_LTLIBRARIES = libenigma_python.la
+noinst_LIBRARIES = libenigma_python.a
-libenigma_python_la_SOURCES = \
+libenigma_python_a_SOURCES = \
connections.cpp \
connections.h \
python.cpp \
python.h \
swig.h
-nodist_libenigma_python_la_SOURCES = \
+nodist_libenigma_python_a_SOURCES = \
enigma_python_wrap.cxx
EXTRA_DIST = \
diff --git a/lib/service/Makefile.am b/lib/service/Makefile.am
index 18c012a5..a19b8b1b 100644
--- a/lib/service/Makefile.am
+++ b/lib/service/Makefile.am
@@ -7,9 +7,9 @@ AM_CPPFLAGS = \
AM_CXXFLAGS = \
$(LIBXINE_CFLAGS)
-noinst_LTLIBRARIES = libenigma_service.la
+noinst_LIBRARIES = libenigma_service.a
-libenigma_service_la_SOURCES = \
+libenigma_service_a_SOURCES = \
event.cpp \
event.h \
iservice.h \
@@ -27,7 +27,7 @@ libenigma_service_la_SOURCES = \
servicemp3.h
if HAVE_LIBXINE
-libenigma_service_la_SOURCES += \
+libenigma_service_a_SOURCES += \
servicexine.cpp \
servicexine.h
endif