[DVDnav-discuss] r964 - in trunk/libdvdnav: Makefile misc/dvdnav-config2.sh

[nicodvb]

Author: nicodvb
Date: Sat Nov 17 20:59:54 2007
New Revision: 964

Log:
don't embed anymore dvdread in dvdnav, thus always link the shared library with -ldvdread

Modified:
   trunk/libdvdnav/Makefile
   trunk/libdvdnav/misc/dvdnav-config2.sh

Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile	(original)
+++ trunk/libdvdnav/Makefile	Sat Nov 17 20:59:54 2007
@@ -35,7 +35,6 @@ DVDREAD_HEADERS = src/dvdread/dvd_reader
 	src/dvdread/nav_types.h
 DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
 	md5.c nav_print.c nav_read.c
-SRCS+= $(DVDREAD_SRCS)
 CFLAGS += -I$(SRC_PATH)/src/dvdread
 else
 L=libdvdnavmini
@@ -95,7 +94,7 @@ ${DVDREAD_LIB}: version.h $(.OBJDIR) $(D
 	cd $(.OBJDIR) && $(RANLIB) $@
 
 ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
-	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) $(THREADLIB) -o $@ $(SHOBJS)
+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldvdread $(THREADLIB) -o $@ $(SHOBJS)
 ${DVDREAD_SHLIB}: version.h $(.OBJDIR) $(DVDREAD_SHOBJS) $(BUILDDEPS)
 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -ldl -o $@ $(DVDREAD_SHOBJS)
 

Modified: trunk/libdvdnav/misc/dvdnav-config2.sh
==============================================================================
--- trunk/libdvdnav/misc/dvdnav-config2.sh	(original)
+++ trunk/libdvdnav/misc/dvdnav-config2.sh	Sat Nov 17 20:59:54 2007
@@ -1,5 +1,5 @@
+dvdreadlib="-ldvdread"
 if test "$dvdread" = "external"; then
-    dvdreadlib="-ldvdread"
     dvdreadmsg="[--minilibs --minicflags]"
     dvdreadcflags="-I$dvdreaddir"
     extracflags="-DDVDNAV_USES_EXTERNAL_DVDREAD"