MacOSX/Framework/Makefile: Use the correct libvlc and libvlc-control when linking.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 19 Sep 2007 10:45:14 +0000 (10:45 +0000)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 19 Sep 2007 10:45:14 +0000 (10:45 +0000)
extras/MacOSX/Framework/Makefile

index 84e037a..7803827 100644 (file)
@@ -7,7 +7,6 @@ LDFLAGS=-single_module -read_only_relocs suppress
 top_srcdir=../../..
 top_builddir=../../..
 
-LIBVLC=$(top_builddir)/src/.libs/libvlc.1.dylib $(top_builddir)/src/.libs/libvlc-control.0.dylib
 LIBVLC_HEADERS=$(top_srcdir)/include
 VLCCONFIG=$(top_srcdir)/vlc-config
 
@@ -145,7 +144,7 @@ VLC.framework/VLC:
 
 VLC.framework/Version/Current/VLC: $(OBJECTS) VLC.framework/Headers VLC.framework/Resources VLC.framework/lib/libvlc-control.dylib VLC.framework/lib/libvlc.dylib VLC.framework/modules VLC.framework/share VLC.framework/VLC
        mkdir -p VLC.framework/Version/Current/Framework && \
-       $(CXX) -dynamiclib $(LDFLAGS) $(OBJECTS) $(FRAMEWORKS) $(LIBVLC) $(MODULES) $(LIBS) -install_name @loader_path/../Frameworks/VLC.framework/Version/Current/VLC -o VLC.framework/Version/Current/VLC && \
+       $(CXX) -dynamiclib $(LDFLAGS) $(OBJECTS) $(FRAMEWORKS) -LVLC.framework/lib -lvlc -lvlc-control $(MODULES) $(LIBS) -install_name @loader_path/../Frameworks/VLC.framework/Version/Current/VLC -o VLC.framework/Version/Current/VLC && \
        install_name_tool -change /usr/local/lib/libvlc-control.0.dylib \
                                  `pwd`/VLC.framework/lib/libvlc-control.dylib \
                           VLC.framework/Version/Current/VLC && \