[libbluray-devel] Fixed examples with --disable-static
hpi1
git at videolan.org
Sat May 14 14:11:59 CEST 2011
libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Tue May 10 14:40:47 2011 +0300| [2e93e629bd44ba32e085ff5961f01155324436c7] | committer: hpi1
Fixed examples with --disable-static
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=2e93e629bd44ba32e085ff5961f01155324436c7
---
src/examples/Makefile.am | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index bc7c348..265bb31 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -14,7 +14,6 @@ noinst_PROGRAMS=bdsplice mpls_dump clpi_dump index_dump mobj_dump sound_dump \
libbluray_test bd_info list_titles hdmv_test
BLURAY_LIB = $(top_builddir)/src/libbluray.la
-BLURAY_LIB_STATIC = $(top_builddir)/src/.libs/libbluray.a
if USING_BDJAVA
AM_CFLAGS += @BDJAVA_CFLAGS@
@@ -26,29 +25,39 @@ bdsplice_SOURCES = \
bdsplice_LDADD = $(BLURAY_LIB)
mpls_dump_SOURCES = \
- mpls_dump.c util.c util.h ../util/strutl.c
-
-mpls_dump_LDADD = $(BLURAY_LIB_STATIC)
+ mpls_dump.c util.c util.h \
+ ../util/strutl.c \
+ ../util/logging.c \
+ ../file/file_posix.c \
+ ../file/dir_posix.c \
+ ../libbluray/bdnav/mpls_parse.c \
+ ../libbluray/bdnav/clpi_parse.c \
+ ../libbluray/bdnav/navigation.c
clpi_dump_SOURCES = \
- clpi_dump.c util.c util.h
-
-clpi_dump_LDADD = $(BLURAY_LIB_STATIC)
+ clpi_dump.c util.c util.h \
+ ../util/logging.c \
+ ../file/file_posix.c \
+ ../libbluray/bdnav/clpi_parse.c
sound_dump_SOURCES = \
- sound_dump.c
-
-sound_dump_LDADD = $(BLURAY_LIB_STATIC)
+ sound_dump.c \
+ ../util/logging.c \
+ ../file/file_posix.c \
+ ../libbluray/bdnav/sound_parse.c
index_dump_SOURCES = \
- index_dump.c
-
-index_dump_LDADD = $(BLURAY_LIB_STATIC)
+ index_dump.c \
+ ../util/logging.c \
+ ../file/file_posix.c \
+ ../libbluray/bdnav/index_parse.c
mobj_dump_SOURCES = \
- mobj_dump.c
-
-mobj_dump_LDADD = $(BLURAY_LIB_STATIC)
+ mobj_dump.c \
+ ../util/logging.c \
+ ../file/file_posix.c \
+ ../libbluray/hdmv/mobj_parse.c \
+ ../libbluray/hdmv/mobj_print.c
libbluray_test_SOURCES = \
libbluray_test.c ../util/logging.c
More information about the libbluray-devel
mailing list