diff --git a/Makefile.am b/Makefile.am index c3e03eb..8ff5959 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,16 @@ -noinst_LIBRARIES = libstb-hal.a -libstb_hal_a_SOURCES = +ACLOCAL_AMFLAGS = -I m4 + +lib_LTLIBRARIES = libstb-hal.la +libstb_hal_la_SOURCES = SUBDIRS = common tools bin_PROGRAMS = libstb-hal-test -libstb_hal_a_LIBADD = \ - common/ca.o \ - common/lt_debug.o \ - common/proc_tools.o +libstb_hal_la_LIBADD = \ + common/libcommon.la libstb_hal_test_SOURCES = libtest.cpp libstb_hal_test_LDADD = \ - libstb-hal.a \ + libstb-hal.la \ -lpthread if BOXTYPE_TRIPLE @@ -21,87 +21,22 @@ endif # there has to be a better way to do this... if BOXTYPE_TRIPLE SUBDIRS += libtriple -libstb_hal_a_LIBADD += \ - libtriple/audio_td.o \ - libtriple/dmx_td.o \ - libtriple/hardware_caps.o \ - libtriple/init_td.o \ - libtriple/lt_dfbinput.o \ - libtriple/playback_td.o \ - libtriple/pwrmngr.o \ - libtriple/record_td.o \ - libtriple/video_td.o +libstb_hal_la_LIBADD += \ + libtriple/libtriple.la endif if BOXTYPE_AZBOX SUBDIRS += azbox -libstb_hal_a_LIBADD += \ - azbox/audio.o \ - azbox/dmx.o \ - azbox/hardware_caps.o \ - azbox/init.o \ - azbox/playback.o \ - azbox/pwrmngr.o \ - azbox/record.o \ - azbox/video.o +libstb_hal_la_LIBADD += \ + azbox/libazbox.la endif if BOXTYPE_GENERIC SUBDIRS += generic-pc -libstb_hal_a_LIBADD += \ - generic-pc/audio.o \ - generic-pc/dmx.o \ - generic-pc/hardware_caps.o \ - generic-pc/init.o \ - generic-pc/playback.o \ - generic-pc/pwrmngr.o \ - generic-pc/record.o \ - generic-pc/video.o +libstb_hal_la_LIBADD += \ + generic-pc/libgeneric.la endif if BOXTYPE_SPARK SUBDIRS += libspark libeplayer3 -libstb_hal_a_LIBADD += \ - libspark/audio.o \ - libspark/dmx.o \ - libspark/hardware_caps.o \ - libspark/init.o \ - libspark/irmp.o \ - libspark/lirmp_input.o \ - libspark/playback_libeplayer3.o \ - libspark/pwrmngr.o \ - libspark/record.o \ - libspark/video.o - -# this is a hack to build the libeplayer3 objs statically into -# libstb-hal... -libstb_hal_a_LIBADD += \ - libeplayer3/container.o \ - libeplayer3/container_ffmpeg.o \ - libeplayer3/text_srt.o \ - libeplayer3/text_ssa.o \ - libeplayer3/container_ass.o \ - libeplayer3/audio.o \ - libeplayer3/manager.o \ - libeplayer3/subtitle.o \ - libeplayer3/video.o \ - libeplayer3/output_subtitle.o \ - libeplayer3/linuxdvb.o \ - libeplayer3/output.o \ - libeplayer3/playback.o \ - libeplayer3/writer.o \ - libeplayer3/aac.o \ - libeplayer3/wmv.o \ - libeplayer3/ac3.o \ - libeplayer3/divx.o \ - libeplayer3/wma.o \ - libeplayer3/pes.o \ - libeplayer3/dts.o \ - libeplayer3/mpeg2.o \ - libeplayer3/mp3.o \ - libeplayer3/misc.o \ - libeplayer3/h264.o \ - libeplayer3/h263.o \ - libeplayer3/vc1.o \ - libeplayer3/framebuffer.o \ - libeplayer3/vorbis.o \ - libeplayer3/flac.o \ - libeplayer3/pcm.o +libstb_hal_la_LIBADD += \ + libspark/libspark.la \ + libeplayer3/libeplayer3.la endif diff --git a/azbox/Makefile.am b/azbox/Makefile.am index f234200..46a3f6c 100644 --- a/azbox/Makefile.am +++ b/azbox/Makefile.am @@ -1,13 +1,12 @@ INCLUDES = \ -I$(top_srcdir)/common -# this library is not used for linking, so call it libdummy... -noinst_LIBRARIES = libdummy.a +noinst_LTLIBRARIES = libazbox.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = -lpthread -libdummy_a_SOURCES = \ +libazbox_la_SOURCES = \ hardware_caps.c \ dmx.cpp \ video.cpp \ diff --git a/common/Makefile.am b/common/Makefile.am index 200f85d..f44757c 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -1,8 +1,8 @@ -noinst_LIBRARIES = libcommon.a +noinst_LTLIBRARIES = libcommon.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -libcommon_a_SOURCES = \ +libcommon_la_SOURCES = \ ca.cpp \ lt_debug.cpp \ proc_tools.c diff --git a/configure.ac b/configure.ac index 5082cb3..c7ef49e 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,10 @@ AC_INIT(libstb-hal,0.1.1) AM_INIT_AUTOMAKE(libstb-hal,0.1.1) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_MACRO_DIR([m4]) +LT_INIT + +## ugly, disables shared library build (not wanted yet) +enable_shared=no TUXBOX_APPS TUXBOX_APPS_DIRECTORY diff --git a/generic-pc/Makefile.am b/generic-pc/Makefile.am index f234200..d85bc75 100644 --- a/generic-pc/Makefile.am +++ b/generic-pc/Makefile.am @@ -1,13 +1,12 @@ INCLUDES = \ -I$(top_srcdir)/common -# this library is not used for linking, so call it libdummy... -noinst_LIBRARIES = libdummy.a +noinst_LTLIBRARIES = libgeneric.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = -lpthread -libdummy_a_SOURCES = \ +libgeneric_la_SOURCES = \ hardware_caps.c \ dmx.cpp \ video.cpp \ diff --git a/libeplayer3/Makefile.am b/libeplayer3/Makefile.am index 3a1f167..cb31f9d 100644 --- a/libeplayer3/Makefile.am +++ b/libeplayer3/Makefile.am @@ -1,11 +1,11 @@ -noinst_LIBRARIES = libeplayer3.a +noinst_LTLIBRARIES = libeplayer3.la CXXFLAGS = -Wall INCLUDES = \ -I$(srcdir)/include -libeplayer3_a_SOURCES = \ +libeplayer3_la_SOURCES = \ container/container.c container/container_ffmpeg.c container/text_srt.c \ container/text_ssa.c container/container_ass.c \ manager/audio.c manager/manager.c manager/subtitle.c manager/video.c \ @@ -28,7 +28,7 @@ AM_CPPFLAGS = -Dattribute_deprecated='' #libeplayer3_la_LIBADD = -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng -LIBEPLAYER3_LIBS = libeplayer3.a -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng +LIBEPLAYER3_LIBS = libeplayer3.la -lpthread -lavformat -lavcodec -lavutil -lz -lass -lm -lpng bin_PROGRAMS = eplayer3 meta eplayer3_SOURCES = tools/eplayer2.c eplayer3_LDADD = $(LIBEPLAYER3_LIBS) diff --git a/libspark/Makefile.am b/libspark/Makefile.am index f35318e..ffb7195 100644 --- a/libspark/Makefile.am +++ b/libspark/Makefile.am @@ -2,12 +2,12 @@ INCLUDES = \ -I$(top_srcdir)/common \ -I$(top_srcdir)/libeplayer3/include -noinst_LIBRARIES = libspark.a +noinst_LTLIBRARIES = libspark.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_LDFLAGS = -lpthread -libspark_a_SOURCES = \ +libspark_la_SOURCES = \ irmp.c \ hardware_caps.c \ lirmp_input.cpp \ diff --git a/libtriple/Makefile.am b/libtriple/Makefile.am index 6ef7656..697be37 100644 --- a/libtriple/Makefile.am +++ b/libtriple/Makefile.am @@ -2,11 +2,11 @@ INCLUDES = \ -I$(top_srcdir)/common \ @DIRECTFB_CFLAGS@ -noinst_LIBRARIES = libtriple.a +noinst_LTLIBRARIES = libtriple.la AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing -libtriple_a_SOURCES = \ +libtriple_la_SOURCES = \ hardware_caps.c \ lt_dfbinput.cpp \ dmx_td.cpp \