README.MacOSX.rtf \
bootstrap \
toolbox \
- vlc-api.pl \
vlc-config.in.in \
vlc.fedora.spec \
vlc.mandriva.spec \
extras/dbus-vlc.py \
extras/dbus-vlc.glade
-###############################################################################
-# MS Visual Studio and eMbedded Visual Studio projects
-###############################################################################
-
-EXTRA_DIST += \
- msvc/vlc.dsw \
- msvc/libvlc.dsp.in \
- msvc/plugins.dsp.in \
- msvc/vlc.dsp.in \
- msvc/config.h.in \
- msvc/modules_builtin_msvc.h \
- evc/vlc.vcw \
- evc/libvlc.vcp.in \
- evc/vlc.vcp.in \
- evc/plugins.vcp.in \
- evc/errno.h \
- evc/config.h.in \
- evc/modules_builtin_evc.h
-
dist-hook:
- cd $(distdir) && srcdir=. $(SHELL) ./toolbox --update-vc
distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
###############################################################################
vlc_WORKAROUNDLDFLAGS = $(LIBVLC)
endif
-vlc_DEPENDENCIES = src/$(LIB_libvlc) $(DATA_win32_rc)
+vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
-if USE_LIBTOOL
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
-vlc_LDFLAGS =
-else
-if HAVE_WIN32
-vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc`
-LIB_libvlc = libvlc.dll.a
-LIBVLC =
-else
-vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
-LIB_libvlc = libvlc.a
-LIBVLC = src/$(LIB_libvlc)
-vlc_DEPENDENCIES += stamp-builtin
-endif
-vlc_LDADD += $(INCLUDED_LIBINTL)
-endif
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
src/$(LIB_libvlc): libvlc
-vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_DEPENDENCIES)
+vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
@rm -f vlc$(EXEEXT)
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
c++) cmd="$(CXXLINK)" ;; \
objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \
esac ; \
- cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
+ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD)" ; \
echo $$cmd ; \
eval $$cmd
fi
# Copy relevant files
- cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
+ cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
- cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
+ cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
- cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+ cp $(top_builddir)/mozilla/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
endif
if BUILD_ACTIVEX
cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
- cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+ cp $(top_builddir)/activex/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
endif
# Rebase all those DLLs to speed up loading (need cygwin rebase)
if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
- $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \
+ $(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
"$(top_builddir)/vlc-${VERSION}/plugins/" ; \
fi ; done
echo "" ; \
echo "# main sources" ; \
find include src -name '*.[chm]' -o -name '*.[ch]pp' \
- | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \
+ | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \
| sort ; \
echo "" ; \
echo "# modules" ; \
###############################################################################
# Enforce Mac OS X deployment target environment variable
###############################################################################
-macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl
+macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
###############################################################################