[DVDnav-discuss] r969 - trunk/libdvdnav/Makefile

[Dominik 'Rathann' Mierzejewski]

On Wednesday, 21 November 2007 at 23:28, rathann wrote:
> Author: rathann
> Date: Wed Nov 21 23:28:28 2007
> New Revision: 969
> 
> Log:
> Fix build with external dvdread

Looks like the patch was a bit incomplete because it no longer builds.
Sorry, here's the missing part.

R.

-- 
Fedora contributor http://fedoraproject.org/wiki/DominikMierzejewski
Livna contributor http://rpm.livna.org MPlayer developer http://mplayerhq.hu
"Faith manages."
        -- Delenn to Lennier in Babylon 5:"Confessions and Lamentations"
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 969)
+++ Makefile	(working copy)
@@ -96,8 +96,13 @@
 	cd $(.OBJDIR) && $(RANLIB) $@
 endif
 
+ifeq ($(DVDREAD),internal)
+${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS) $(DVDREAD_SHLIB)
+	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -L. -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
+else
 ${SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) -ldvdread $(THREADLIB)
+endif
 ${MINI_SHLIB}: version.h $(.OBJDIR) $(SHOBJS) $(BUILDDEPS)
 	cd $(.OBJDIR) && $(CC) $(SHLDFLAGS) -Wl,-soname=$(MINI_SHLIB).$(SHLIB_MAJOR) -o $@ $(SHOBJS) $(THREADLIB)
 ifeq ($(DVDREAD),internal)