Commit eb30ea97 authored by gates's avatar gates

Integrate libbdnav into libbluray, making the two libraries into one

parent 65f01af2
......@@ -63,6 +63,5 @@ AM_CONDITIONAL([USING_DLOPEN],
# generate output files
AC_SUBST(DLOPEN_LDFLAGS)
AC_CONFIG_FILES([Makefile src/Makefile src/libbdnav/Makefile
src/examples/Makefile src/libbluray.pc])
AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc])
AC_OUTPUT
SUBDIRS=libbdnav . examples
SUBDIRS= . examples
AM_CFLAGS = -I$(top_builddir)/src
......@@ -8,9 +8,24 @@ endif
lib_LTLIBRARIES=libbluray.la
libbluray_ladir= $(includedir)/libbluray
libbluray_la_SOURCES= libbluray/bluray.c file/dl_posix.c
libbluray_la_SOURCES= libbluray/bluray.c \
file/dl_posix.c \
util/logging.c \
util/strutl.c \
file/file_posix.c \
file/dir_posix.c \
libbluray/bdnav/navigation.c \
libbluray/bdnav/navigation.h \
libbluray/bdnav/mpls_parse.c \
libbluray/bdnav/clpi_parse.c \
libbluray/bdnav/mpls_parse.h \
libbluray/bdnav/clpi_parse.h \
libbluray/bdnav/mobj_parse.c \
libbluray/bdnav/mobj_parse.h \
libbluray/bdnav/index_parse.c \
libbluray/bdnav/index_parse.h
libbluray_la_HEADERS= libbluray/bluray.h
libbluray_la_LIBADD = libbdnav/libbdnav.la
libbluray_la_LDFLAGS= -version-info 0:0:0 $(LIBBLURAY_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
......
......@@ -4,39 +4,39 @@ AM_CFLAGS = -I$(top_builddir)/src
noinst_PROGRAMS=bdsplice mpls_dump clpi_dump index_dump mobj_dump \
libbluray_test list_titles
BDNAV_LIB = $(top_builddir)/src/libbdnav/libbdnav.la
BLURAY_LIB = $(top_builddir)/src/libbluray.la
bdsplice_SOURCES = \
bdsplice.c
bdsplice_LDADD = $(BDNAV_LIB)
bdsplice_LDADD = $(BLURAY_LIB)
mpls_dump_SOURCES = \
mpls_dump.c util.c
mpls_dump_LDADD = $(BDNAV_LIB)
mpls_dump_LDADD = $(BLURAY_LIB)
clpi_dump_SOURCES = \
clpi_dump.c util.c
clpi_dump_LDADD = $(BDNAV_LIB)
clpi_dump_LDADD = $(BLURAY_LIB)
index_dump_SOURCES = \
index_dump.c
index_dump_LDADD = $(BDNAV_LIB)
index_dump_LDADD = $(BLURAY_LIB)
mobj_dump_SOURCES = \
mobj_dump.c
mobj_dump_LDADD = $(BDNAV_LIB)
mobj_dump_LDADD = $(BLURAY_LIB)
libbluray_test_SOURCES = \
libbluray_test.c
libbluray_test_LDADD = $(top_builddir)/src/libbluray.la
libbluray_test_LDADD = $(BLURAY_LIB)
list_titles_SOURCES = \
list_titles.c
list_titles_LDADD = $(top_builddir)/src/libbluray.la
list_titles_LDADD = $(BLURAY_LIB)
......@@ -47,9 +47,9 @@
#include <inttypes.h>
#include "../util/macro.h"
#include "../util/strutl.h"
#include "../libbdnav/clpi_parse.h"
#include "../libbdnav/mpls_parse.h"
#include "../libbdnav/navigation.h"
#include "libbluray/bdnav/clpi_parse.h"
#include "libbluray/bdnav/mpls_parse.h"
#include "libbluray/bdnav/navigation.h"
#define PKT_SIZE 192
#define MIN(a,b) (((a) < (b)) ? a : b)
......
......@@ -33,7 +33,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <unistd.h>
#include "../libbdnav/clpi_parse.h"
#include "libbluray/bdnav/clpi_parse.h"
#include "util.h"
static int verbose;
......
......@@ -31,7 +31,7 @@
#include <string.h>
#include <inttypes.h>
#include "../src/libbdnav/index_parse.h"
#include "libbluray/bdnav/index_parse.h"
static void _indx_print_app_info(INDX_APP_INFO *app_info)
......
......@@ -33,8 +33,8 @@
#include "../util/macro.h"
#include "../libbdnav/mobj_parse.h"
#include "../libbdnav/hdmv_insn.h"
#include "libbluray/bdnav/mobj_parse.h"
#include "libbluray/bdnav/hdmv_insn.h"
const char * const psr_info[128] = {
"/* PSR0: Interactive graphics stream number */",
......
......@@ -36,8 +36,8 @@
#include <string.h>
#include <libgen.h>
#include "../util/strutl.h"
#include "../libbdnav/mpls_parse.h"
#include "../libbdnav/navigation.h"
#include "libbluray/bdnav/mpls_parse.h"
#include "libbluray/bdnav/navigation.h"
#include "util.h"
static int verbose;
......
......@@ -33,9 +33,9 @@
#include <unistd.h>
#include <string.h>
#include <libgen.h>
#include "../util/macro.h"
#include "../file/file.h"
#include "../util/bits.h"
#include "util/macro.h"
#include "file/file.h"
#include "util/bits.h"
#include "clpi_parse.h"
#define CLPI_SIG1 ('H' << 24 | 'D' << 16 | 'M' << 8 | 'V')
......
......@@ -30,10 +30,10 @@
#include <stdint.h>
#include <stdlib.h>
#include "../file/file.h"
#include "../util/bits.h"
#include "../util/logging.h"
#include "../util/macro.h"
#include "file/file.h"
#include "util/bits.h"
#include "util/logging.h"
#include "util/macro.h"
#include "index_parse.h"
......
......@@ -30,10 +30,10 @@
#include <stdint.h>
#include <stdlib.h>
#include "../file/file.h"
#include "../util/bits.h"
#include "../util/logging.h"
#include "../util/macro.h"
#include "file/file.h"
#include "util/bits.h"
#include "util/logging.h"
#include "util/macro.h"
#include "mobj_parse.h"
......
......@@ -33,9 +33,9 @@
#include <unistd.h>
#include <string.h>
#include <libgen.h>
#include "../util/macro.h"
#include "../file/file.h"
#include "../util/bits.h"
#include "util/macro.h"
#include "file/file.h"
#include "util/bits.h"
#include "mpls_parse.h"
#define MPLS_SIG1 ('M' << 24 | 'P' << 16 | 'L' << 8 | 'S')
......
......@@ -40,11 +40,11 @@
#include <stdint.h>
#include <string.h>
#include "../util/macro.h"
#include "../util/logging.h"
#include "../util/strutl.h"
#include "../file/dir.h"
#include "../file/file.h"
#include "util/macro.h"
#include "util/logging.h"
#include "util/strutl.h"
#include "file/dir.h"
#include "file/file.h"
#include "mpls_parse.h"
#include "navigation.h"
......
......@@ -21,9 +21,9 @@
#include "util/logging.h"
#include "util/strutl.h"
#include "file/dl.h"
#include "libbdnav/navigation.h"
#include "bdnav/navigation.h"
#include "libbdnav/index_parse.h"
#include "bdnav/index_parse.h"
#ifndef USING_DLOPEN
#include <libaacs/aacs.h>
......
......@@ -6,7 +6,7 @@
#include <unistd.h>
#include "file/file.h"
#include "libbdnav/navigation.h"
#include "bdnav/navigation.h"
struct indx_root_s;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment