[DVDnav-discuss] r926 - in trunk/libdvdnav: misc/dvdnav-config.in src/Makefile.am

[nicodvb]

Author: nicodvb
Date: Sun Apr 29 20:10:02 2007
New Revision: 926

Log:
added targets to build a version of the library (libdvdnavmini) without dvdread embedded and corresponding dvdnav-config --minilibs

Modified:
   trunk/libdvdnav/misc/dvdnav-config.in
   trunk/libdvdnav/src/Makefile.am

Modified: trunk/libdvdnav/misc/dvdnav-config.in
==============================================================================
--- trunk/libdvdnav/misc/dvdnav-config.in	(original)
+++ trunk/libdvdnav/misc/dvdnav-config.in	Sun Apr 29 20:10:02 2007
@@ -15,6 +15,7 @@ Options:
 	[--exec-prefix[=DIR]]
 	[--version]
         [--libs]
+        [--minilibs]
 	[--cflags]
 EOF
 	exit $1
@@ -56,6 +57,9 @@ while test $# -gt 0; do
     --libs)
       echo_libs=yes
       ;;
+    --minilibs)
+      echo_minilibs=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -77,4 +81,8 @@ fi
 
 if test "$echo_libs" = "yes"; then
       echo -L at libdir@ -ldvdnav @THREAD_LIBS@
+fi
+
+if test "$echo_minilibs" = "yes"; then
+      echo -L at libdir@ -ldvdnavmini @THREAD_LIBS@
 fi      

Modified: trunk/libdvdnav/src/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/Makefile.am	(original)
+++ trunk/libdvdnav/src/Makefile.am	Sun Apr 29 20:10:02 2007
@@ -9,7 +9,7 @@ AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
 
-lib_LTLIBRARIES = libdvdnav.la
+lib_LTLIBRARIES = libdvdnav.la libdvdnavmini.la
 
 libdvdnav_la_SOURCES = dvdnav.c \
 	read_cache.c navigation.c highlight.c \
@@ -25,4 +25,11 @@ libdvdnav_la_LDFLAGS = \
 	-export-symbols-regex "(^dvdnav.*|^nav.*|^ifo.*|^DVD.*)"
 #	-release $(DVDNAV_MAJOR).$(DVDNAV_MINOR).$(DVDNAV_SUB)
 
+libdvdnavmini_la_SOURCES = $(libdvdnav_la_SOURCES)
+
+libdvdnavmini_la_LIBADD = $(THREAD_LIBS) \
+	$(top_builddir)/src/vm/libdvdvm.la
+
+libdvdnavmini_la_LDFLAGS = $(libdvdnav_la_LDFLAGS)
+
 include_HEADERS = dvdnav.h dvdnav_events.h dvd_types.h