deuglify library build

* build intermediate libraries for each subdirectory
* link those libs in main directory instead of single objects
* ugly hack in configure.ac to disable dynamic lib for now


Origin commit data
------------------
Branch: master
Commit: 7c46077051
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-01 (Sat, 01 Dec 2012)



------------------
This commit was generated by Migit

Makefile.am

@@ -1,16 +1,16 @@
-noinst_LIBRARIES = libstb-hal.a
+ACLOCAL_AMFLAGS = -I m4
-libstb_hal_a_SOURCES =
+
+lib_LTLIBRARIES = libstb-hal.la
+libstb_hal_la_SOURCES =
 SUBDIRS = common tools
 bin_PROGRAMS = libstb-hal-test
 
-libstb_hal_a_LIBADD = \
+libstb_hal_la_LIBADD = \
-	common/ca.o \
+	common/libcommon.la
-	common/lt_debug.o \
-	common/proc_tools.o
 
 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 += \
+libstb_hal_la_LIBADD += \
-	libtriple/audio_td.o \
+	libtriple/libtriple.la
-	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
 endif
 if BOXTYPE_AZBOX
 SUBDIRS += azbox
-libstb_hal_a_LIBADD += \
+libstb_hal_la_LIBADD += \
-	azbox/audio.o \
+	azbox/libazbox.la
-	azbox/dmx.o \
-	azbox/hardware_caps.o \
-	azbox/init.o \
-	azbox/playback.o \
-	azbox/pwrmngr.o \
-	azbox/record.o \
-	azbox/video.o
 endif
 if BOXTYPE_GENERIC
 SUBDIRS += generic-pc
-libstb_hal_a_LIBADD += \
+libstb_hal_la_LIBADD += \
-	generic-pc/audio.o \
+	generic-pc/libgeneric.la
-	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
 endif
 if BOXTYPE_SPARK
 SUBDIRS += libspark libeplayer3
-libstb_hal_a_LIBADD += \
+libstb_hal_la_LIBADD += \
-	libspark/audio.o \
+	libspark/libspark.la \
-	libspark/dmx.o \
+	libeplayer3/libeplayer3.la
-	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
 endif

azbox/Makefile.am

@@ -1,13 +1,12 @@
 INCLUDES = \
 	-I$(top_srcdir)/common
 
-# this library is not used for linking, so call it libdummy...
+noinst_LTLIBRARIES = libazbox.la
-noinst_LIBRARIES = libdummy.a
 
 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 \

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

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

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_LTLIBRARIES = libgeneric.la
-noinst_LIBRARIES = libdummy.a
 
 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 \

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)

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 \

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 \