vlc.exe.manifest \
MAINTAINERS \
README.MacOSX.rtf \
- bootstrap \
- toolbox \
vlc-config.in.in \
vlc.fedora.spec \
vlc.mandriva.spec \
vlc.altlinux.spec \
vlc.win32.nsi.in
+dist_noinst_SCRIPTS = bootstrap toolbox
+
BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
+if HAVE_DARWIN
BUILT_SOURCES_clean = macosx-sdk
+else
+BUILT_SOURCES_clean =
+endif
BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
extras/make.pl \
extras/valgrind.suppressions \
extras/m4/autoconf260.m4 \
- extras/dbus-vlc.py \
- extras/dbus-vlc.glade
+ extras/mpris.py \
+ extras/mpris.glade
dist-hook:
distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
# Ugly kludge so that automake defines $(CXXLINK)
nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
-# Work around a bug in the arm-wince-pe linker
-if HAVE_WINCE
-vlc_WORKAROUNDLDFLAGS = $(LIBVLC)
-endif
-
vlc_DEPENDENCIES = $(LIBVLC) $(DATA_win32_rc)
vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+if !HAVE_PLUGINS
+vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
+endif
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
+#To get some nice output
+nice:
+ $(top_builddir)/compile
+
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch
objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \
esac ; \
- cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD)" ; \
+ cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
echo $$cmd ; \
eval $$cmd
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
done ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
+ for i in $(srcdir)/share/luameta/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
+ done ; \
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
done ; \
fi
- ln -sfn `pwd`/share $(top_builddir)/VLC.app/Contents/MacOS/
+ ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
endif
-###############################################################################
-# Building specific source packages
-###############################################################################
-
-dist-woody: distdir
- $(remove_distdir_woody)
- mv $(distdir) $(PACKAGE)-woody-$(VERSION)
- $(srcdir)/toolbox --make-woody $(PACKAGE)-woody-$(VERSION)
- $(AMTAR) chof - $(PACKAGE)-woody-$(VERSION) \
- | GZIP=$(GZIP_ENV) gzip -c >$(PACKAGE)-woody-$(VERSION).tar.gz
- $(remove_distdir_woody)
-
-remove_distdir_woody = \
- { test ! -d $(PACKAGE)-woody-$(VERSION) \
- || { find $(PACKAGE)-woody-$(VERSION) -type d ! -perm -200 \
- -exec chmod u+w {} ';' \
- && rm -fr $(PACKAGE)-woody-$(VERSION); }; }
-
###############################################################################
# Building architecture-specific binary packages
###############################################################################
# XXX: this rule is probably only useful to you if you have exactly
-# the same setup as me. Contact sam@zoy.org if you need to use it.
+# the same setup as the maintaner(s).
#
package-win-common:
cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
+ cp "$(top_builddir)/src/.libs/libvlc-control$(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/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+ cp $(top_builddir)/mozilla/.libs/npvlc$(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/.libs/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+ cp $(top_builddir)/activex/.libs/axvlc$(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 \
package-win-common-strip:
$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
$(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
+ $(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)"
if BUILD_MOZILLA
- $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT);
endif
if BUILD_ACTIVEX
- $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+ $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT);
endif
package-win32-base-debug: package-win-common
cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
done
+ $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist
+ for i in $(srcdir)/share/luaplaylist/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \
+ done ;
+ $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta
+ for i in $(srcdir)/share/luameta/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \
+ done ;
+
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
###############################################################################
# PO translation files update
+# Generate po/POTFILES.in which lists all the files containing translatable
+# strings. Find all source files and remove the generated files
###############################################################################
.PHONY: update-po
echo "# modules" ; \
find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
+ | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
###############################################################################
# Stamp rules
###############################################################################
-stamp-builtin: FORCE
- @for dep in "" `$(VLC_CONFIG) --target builtin`; do \
- if test "$${dep}" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
- rm -f $@; \
+stamp-builtin:
+ @for dep in "" `$(VLC_CONFIG) --target plugin`; do \
+ if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
+ touch "$@"; \
break; \
fi; \
done
- @if test ! -f $@; then printf "" > $@; fi
+
+.PHONY: stamp-builtin
###############################################################################
# Enforce Mac OS X deployment target environment variable
###############################################################################
macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
-
-###############################################################################
-# Force rule
-###############################################################################
-FORCE:
projects / vlc / blobdiff