libbluray | branch: master | Diego Elio Pettenò <[email protected]> | Thu
Feb 14 18:35:17 2013 -0800| [29bea353371ccb3592a515908a9bd55aa253c158] |
committer: hpi1
build: simplify a bit the build makefile.
Conflicts:
src/Makefile.am
> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=29bea353371ccb3592a515908a9bd55aa253c158
---
src/Makefile.am | 43 +++++++++++++++++++++----------------------
1 file changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a2f39ae..acb61ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,27 +3,11 @@ SET_INCLUDES = -I$(top_srcdir) -Ifile -Ilibbluray/bdnav
AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS)
$(FT2_CFLAGS)
-SOURCES_bdj = libbluray/bdj/bdj.h \
- libbluray/bdj/bdj_private.h \
- libbluray/bdj/bdj_util.h \
- libbluray/bdj/bdj_util.c \
- libbluray/bdj/bdj.c \
- libbluray/bdj/bdjo_parser.h \
- libbluray/bdj/bdjo_parser.c \
- libbluray/bdj/common.h \
- libbluray/bdj/native/java_awt_BDGraphics.h \
- libbluray/bdj/native/java_awt_BDGraphics.c \
- libbluray/bdj/native/java_awt_BDFontMetrics.h \
- libbluray/bdj/native/java_awt_BDFontMetrics.c \
- libbluray/bdj/native/org_videolan_Libbluray.h \
- libbluray/bdj/native/org_videolan_Libbluray.c \
- libbluray/bdj/native/register_native.h \
- libbluray/bdj/native/register_native.c
-
EXTRA_DIST = libbluray/bdj/build.xml libbluray/bdj/java
lib_LTLIBRARIES=libbluray.la
-libbluray_la_SOURCES=libbluray/bluray.h \
+libbluray_la_SOURCES = \
+ libbluray/bluray.h \
libbluray/bluray.c \
libbluray/bluray_internal.h \
libbluray/register.h \
@@ -103,14 +87,30 @@ pkginclude_HEADERS = \
util/log_control.h
if USING_BDJAVA
-
jardir=$(libdir)/libbluray/
jar_DATA=$(top_builddir)/src/.libs/libbluray.jar
$(top_builddir)/src/.libs/libbluray.jar: all-local
-libbluray_la_SOURCES+=$(SOURCES_bdj)
-AM_CFLAGS+=@BDJAVA_CFLAGS@
+libbluray_la_SOURCES += \
+ libbluray/bdj/bdj.h \
+ libbluray/bdj/bdj_private.h \
+ libbluray/bdj/bdj_util.h \
+ libbluray/bdj/bdj_util.c \
+ libbluray/bdj/bdj.c \
+ libbluray/bdj/bdjo_parser.h \
+ libbluray/bdj/bdjo_parser.c \
+ libbluray/bdj/common.h \
+ libbluray/bdj/native/java_awt_BDGraphics.h \
+ libbluray/bdj/native/java_awt_BDGraphics.c \
+ libbluray/bdj/native/java_awt_BDFontMetrics.h \
+ libbluray/bdj/native/java_awt_BDFontMetrics.c \
+ libbluray/bdj/native/org_videolan_Libbluray.h \
+ libbluray/bdj/native/org_videolan_Libbluray.c \
+ libbluray/bdj/native/register_native.h \
+ libbluray/bdj/native/register_native.c
+
+AM_CFLAGS += $(BDJAVA_CFLAGS)
all-local:
ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
@@ -119,7 +119,6 @@ all-local:
clean-local:
ant -f $(top_srcdir)/src/libbluray/bdj/build.xml clean
-
endif
pkgconfigdir = $(libdir)/pkgconfig
_______________________________________________
libbluray-devel mailing list
[email protected]
http://mailman.videolan.org/listinfo/libbluray-devel
