# Ugly kludge so that automake defines $(CXXLINK)
nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
-vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(DATA_win32_rc)
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
if !HAVE_PLUGINS
vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
endif
libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
-core: libvlc
- $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
+core: libvlc vlc$(EXEEXT)
.PHONY: libvlc core
-src/$(LIB_libvlc): libvlc
-
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
$(top_builddir)/VLC-release.app/Contents/MacOS/VLC
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+ $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
@executable_path/lib/libvlc.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+ $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
@executable_path/lib/libvlc.dylib \
MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
- elif wine --version >dev/null 2>&1; then \
+ elif wine --version >/dev/null 2>&1; then \
MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
else \
echo 'Error: cannot locate makensis tool'; exit 1; \
| sort ; \
echo "" ; \
echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
+ find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
| grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
| sort ; \