libbluray | branch: flameeyes | Diego Elio Pettenò <[email protected]> | Thu Feb 14 18:48:01 2013 -0800| [d2740e8acd67aab54173dc5df743fbfa8045db2a] | committer: Diego Elio Pettenò
build: remove a level of recursion by removing src/Makefile.am This builds the library at top-level, but the objects are still built where their object file is. > http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=d2740e8acd67aab54173dc5df743fbfa8045db2a --- .gitignore | 3 +- Makefile.am | 136 ++++++++++++++++++++++++++++++++++++++++++- configure.ac | 4 +- src/examples/Makefile.am | 2 +- src/libbluray/bdj/build.xml | 2 +- 5 files changed, 139 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f0de81c..81a92cc 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,6 @@ src/examples/bd_info src/examples/hdmv_test src/examples/*.exe src/libbluray/bdj/build -src/libbluray.jar +libbluray.jar stamp-h1 +.dirstamp diff --git a/Makefile.am b/Makefile.am index 859a1f4..3ec26fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,14 +1,144 @@ include $(top_srcdir)/doxygen-include.am -SUBDIRS = src if USING_EXAMPLES -SUBDIRS += src/examples +SUBDIRS = src/examples endif ACLOCAL_AMFLAGS=-I m4 -EXTRA_DIST=bootstrap doc COPYING player_wrappers README.txt ChangeLog +EXTRA_DIST = \ + bootstrap \ + doc \ + COPYING \ + player_wrappers \ + src/libbluray/bdj/build.xml \ + src/libbluray/bdj/java + +dist_doc_DATA = README.txt ChangeLog MOSTLYCLEANFILES = $(DX_CLEANFILES) DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava + +AM_CFLAGS = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT \ + -I$(top_srcdir)/src -I$(top_srcdir)/src/file -I$(top_srcdir)/src/libbluray/bdnav \ + $(LIBXML2_CFLAGS) $(FT2_CFLAGS) + +lib_LTLIBRARIES = libbluray.la + +libbluray_la_LDFLAGS = -version-info $(LT_VERSION_INFO) +libbluray_la_LIBADD = $(LIBXML2_LIBS) $(FT2_LIBS) + +libbluray_la_SOURCES = \ + src/libbluray/bluray.h \ + src/libbluray/bluray.c \ + src/libbluray/bluray_internal.h \ + src/libbluray/register.h \ + src/libbluray/register.c \ + src/libbluray/keys.h \ + src/libbluray/bdnav \ + src/libbluray/bdnav/bdparse.h \ + src/libbluray/bdnav/uo_mask_table.h \ + src/libbluray/bdnav/navigation.h \ + src/libbluray/bdnav/index_parse.c \ + src/libbluray/bdnav/navigation.c \ + src/libbluray/bdnav/sound_parse.c \ + src/libbluray/bdnav/sound_parse.h \ + src/libbluray/bdnav/mpls_parse.h \ + src/libbluray/bdnav/clpi_parse.c \ + src/libbluray/bdnav/mpls_parse.c \ + src/libbluray/bdnav/index_parse.h \ + src/libbluray/bdnav/clpi_parse.h \ + src/libbluray/bdnav/meta_data.h \ + src/libbluray/bdnav/meta_parse.c \ + src/libbluray/bdnav/meta_parse.h \ + src/libbluray/bdnav/extdata_parse.h \ + src/libbluray/bdnav/extdata_parse.c \ + src/libbluray/bdnav/bdid_parse.h \ + src/libbluray/bdnav/bdid_parse.c \ + src/libbluray/decoders \ + src/libbluray/decoders/pes_buffer.h \ + src/libbluray/decoders/pes_buffer.c \ + src/libbluray/decoders/m2ts_demux.h \ + src/libbluray/decoders/m2ts_demux.c \ + src/libbluray/decoders/overlay.h \ + src/libbluray/decoders/pg.h \ + src/libbluray/decoders/pg_decode.h \ + src/libbluray/decoders/pg_decode.c \ + src/libbluray/decoders/ig.h \ + src/libbluray/decoders/ig_decode.h \ + src/libbluray/decoders/ig_decode.c \ + src/libbluray/decoders/graphics_processor.h \ + src/libbluray/decoders/graphics_processor.c \ + src/libbluray/decoders/graphics_controller.h \ + src/libbluray/decoders/graphics_controller.c \ + src/libbluray/hdmv \ + src/libbluray/hdmv/hdmv_insn.h \ + src/libbluray/hdmv/hdmv_vm.h \ + src/libbluray/hdmv/hdmv_vm.c \ + src/libbluray/hdmv/mobj_parse.h \ + src/libbluray/hdmv/mobj_parse.c \ + src/libbluray/hdmv/mobj_print.c \ + src/file/dir_posix.c \ + src/file/file.h \ + src/file/file_posix.c \ + src/file/dl.h \ + src/file/dl_posix.c \ + src/file/filesystem.h \ + src/file/filesystem.c \ + src/util/attributes.h \ + src/util/strutl.c \ + src/util/strutl.h \ + src/util/macro.h \ + src/util/mutex.h \ + src/util/logging.c \ + src/util/log_control.h \ + src/util/bits.h \ + src/util/bits.c \ + src/util/logging.h + +pkginclude_HEADERS = \ + src/file/filesystem.h \ + src/libbluray/bdnav/clpi_data.h \ + src/libbluray/bdnav/meta_data.h \ + src/libbluray/bluray-version.h \ + src/libbluray/bluray.h \ + src/libbluray/decoders/overlay.h \ + src/libbluray/keys.h \ + src/util/log_control.h + +if USING_BDJAVA +jardir = $(libdir)/libbluray/ +jar_DATA = libbluray.jar + +libbluray.jar: + ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ + -Dsrc_awt=:java-$(BDJ_TYPE) \ + -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" + +libbluray_la_SOURCES += \ + src/libbluray/bdj/bdj.h \ + src/libbluray/bdj/bdj_private.h \ + src/libbluray/bdj/bdj_util.h \ + src/libbluray/bdj/bdj_util.c \ + src/libbluray/bdj/bdj.c \ + src/libbluray/bdj/bdjo_parser.h \ + src/libbluray/bdj/bdjo_parser.c \ + src/libbluray/bdj/common.h \ + src/libbluray/bdj/native/java_awt_BDGraphics.h \ + src/libbluray/bdj/native/java_awt_BDGraphics.c \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.h \ + src/libbluray/bdj/native/java_awt_BDFontMetrics.c \ + src/libbluray/bdj/native/org_videolan_Libbluray.h \ + src/libbluray/bdj/native/org_videolan_Libbluray.c \ + src/libbluray/bdj/native/register_native.h \ + src/libbluray/bdj/native/register_native.c + +AM_CFLAGS += $(BDJAVA_CFLAGS) + +clean-local: + ant -f $(top_srcdir)/src/libbluray/bdj/build.xml clean +endif + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = src/libbluray.pc diff --git a/configure.ac b/configure.ac index 219569d..ccfcfe2 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libblur AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2 no-dist-gzip subdir-objects]) AC_CONFIG_HEADERS(config.h) case "${host_os}" in @@ -218,7 +218,7 @@ AC_SUBST(LT_VERSION_INFO) dnl generate output files AC_SUBST(BDJAVA_CFLAGS) -AC_CONFIG_FILES([Makefile src/Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h]) +AC_CONFIG_FILES([Makefile src/examples/Makefile src/libbluray.pc src/libbluray/bluray-version.h]) AC_OUTPUT diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am index 9057187..2cbe053 100644 --- a/src/examples/Makefile.am +++ b/src/examples/Makefile.am @@ -6,7 +6,7 @@ AM_CFLAGS = $(SET_FEATURES) $(SET_INCLUDES) EXTRA_PROGRAMS=bdsplice mpls_dump clpi_dump index_dump mobj_dump sound_dump \ libbluray_test list_titles hdmv_test bd_info -BLURAY_LIB = $(top_builddir)/src/libbluray.la +BLURAY_LIB = $(top_builddir)/libbluray.la if USING_BDJAVA AM_CFLAGS += @BDJAVA_CFLAGS@ diff --git a/src/libbluray/bdj/build.xml b/src/libbluray/bdj/build.xml index 37cdc56..83cf99c 100644 --- a/src/libbluray/bdj/build.xml +++ b/src/libbluray/bdj/build.xml @@ -5,7 +5,7 @@ <property name="src" location="java"/> <property name="build" location="build"/> - <property name="dist" location="../.."/> + <property name="dist" location="../../.."/> <property name="src_awt" value=""/> <property name="bootclasspath" value=""/> _______________________________________________ libbluray-devel mailing list [email protected] http://mailman.videolan.org/listinfo/libbluray-devel
