toolbox \
vlc-api.pl \
vlc-config.in.in \
- vlc.spec \
- vlc.spec.mdk \
+ vlc.fedora.spec \
+ vlc.mandriva.spec \
+ vlc.altlinux.spec \
vlc.win32.nsi.in \
$(NULL)
SUFFIXES =
DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
- --disable-ffmpeg --disable-faad --disable-skins2
-if USE_LIBTOOL
-DISTCHECK_CONFIGURE_FLAGS += --enable-libtool
-endif
+ --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
+ extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
extras/MacOSX/Resources/a52.icns \
extras/MacOSX/Resources/aac.icns \
extras/MacOSX/Resources/vlc.scriptSuite \
extras/MacOSX/Resources/vlc.scriptTerminology \
extras/MacOSX/Resources/README \
- extras/MacOSX/vlc.pbproj/project.pbxproj \
+ extras/MacOSX/Resources/add_embedded.png \
+ extras/MacOSX/Resources/add_embedded_blue.png \
+ extras/MacOSX/Resources/repeat_embedded.png \
+ extras/MacOSX/Resources/repeat_embedded_blue.png \
+ extras/MacOSX/Resources/repeat_single_embedded_blue.png \
+ extras/MacOSX/Resources/shuffle_embedded.png \
+ extras/MacOSX/Resources/shuffle_embedded_blue.png \
+ extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
+ extras/MacOSX/Resources/fs_volume_slider_knob.png \
+ extras/MacOSX/Resources/fs_volume_slider_bar.png \
+ extras/MacOSX/Resources/fs_volume_mute_highlight.png \
+ extras/MacOSX/Resources/fs_volume_mute.png \
+ extras/MacOSX/Resources/fs_volume_max_highlight.png \
+ extras/MacOSX/Resources/fs_volume_max.png \
+ extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
+ extras/MacOSX/Resources/fs_time_slider_knob.png \
+ extras/MacOSX/Resources/fs_time_slider.png \
+ extras/MacOSX/Resources/fs_stop_highlight.png \
+ extras/MacOSX/Resources/fs_stop.png \
+ extras/MacOSX/Resources/fs_skip_previous_highlight.png \
+ extras/MacOSX/Resources/fs_skip_previous.png \
+ extras/MacOSX/Resources/fs_skip_next_highlight.png \
+ extras/MacOSX/Resources/fs_skip_next.png \
+ extras/MacOSX/Resources/fs_rewind_highlight.png \
+ extras/MacOSX/Resources/fs_rewind.png \
+ extras/MacOSX/Resources/fs_play_highlight.png \
+ extras/MacOSX/Resources/fs_play.png \
+ extras/MacOSX/Resources/fs_pause_highlight.png \
+ extras/MacOSX/Resources/fs_pause.png \
+ extras/MacOSX/Resources/fs_forward_highlight.png \
+ extras/MacOSX/Resources/fs_forward.png \
+ extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
+ extras/MacOSX/Resources/fs_exit_fullscreen.png \
+ extras/MacOSX/Resources/fs_background.png \
+ extras/MacOSX/fullscreen_panel.svg \
+ extras/MacOSX/ub.sh \
+ extras/MacOSX/vlc.xcodeproj/project.pbxproj \
extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
$(NULL)
###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
##############################################################################
EXTRA_DIST += \
extras/Makefile \
extras/vlc.vim \
extras/make.pl \
extras/valgrind.suppressions \
+ extras/m4/autoconf260.m4 \
+ extras/dbus-vlc.py \
+ extras/dbus-vlc.glade \
$(NULL)
###############################################################################
vlc_SOURCES = src/vlc.c
# Ugly kludge so that automake defines $(CXXLINK)
-EXTRA_vlc_SOURCES = extras/zsh.cpp
+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_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
+vlc_LDFLAGS =
else
-if BUILD_SHARED
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
if HAVE_WIN32
+vlc_LDFLAGS = -L$(top_builddir)/src -lvlc `$(VLC_CONFIG) --libs vlc`
LIB_libvlc = libvlc.dll.a
-else
-LIB_libvlc = libvlc$(LIBEXT)
-endif
LIBVLC =
else
vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
# 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
-core:
- rm -f src/$(LIB_libvlc)
+libvlc:
+ cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+
+core: libvlc
$(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
-.PHONY: core
+.PHONY: libvlc core
-src/$(LIB_libvlc):
- cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
+src/$(LIB_libvlc): libvlc
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
endif
# Install the symlinks
-install-exec-local:
+install-exec-local: install-binPROGRAMS
+ inst="`echo vlc | sed -e '$(transform)'`" ; \
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" && \
- ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
+ ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
# the opposite of install-{data,exec}-local
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
+ fspanel.h \
+ fspanel.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- case $(target_triplet) in \
- *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
- cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC-release.app;; \
- *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
- cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC-release.app;; \
- *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
- $(top_builddir)/VLC-release.app;; \
- esac
+ $(top_builddir)/VLC-release.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
$(INSTALL) $(top_builddir)/vlc \
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
+ fspanel.h \
+ fspanel.m \
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
- case $(target_triplet) in \
- *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
- cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC.app;; \
- *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
- cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
- $(top_builddir)/VLC.app;; \
- *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
- cd ../../../; \
+ cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+ cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
- $(top_builddir)/VLC.app;; \
- esac
+ $(top_builddir)/VLC.app; \
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
$(INSTALL) $(top_builddir)/vlc \
# Copy relevant files
cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-if BUILD_SHARED
cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-endif
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
+ cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ;
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
+ cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ;
cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+ cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
+ cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
if BUILD_MOZILLA
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
- cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ;
endif
if BUILD_ACTIVEX
package-win-common-strip:
$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
-if BUILD_SHARED
$(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
-endif
if BUILD_MOZILLA
$(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
endif
package-win32-base-zip: package-win32-base
# Create package
- zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+ zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION}
package-win32-base-7zip: package-win32-base
# Create package
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
-package-win32: package-win32-base-exe package-win32-base-zip
+package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip
+
+package-win32: package-win32-no-clean
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
- (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+ (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
- (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+ (cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
# Clean up
mkdir -p "$(top_builddir)/vlc-${VERSION}/";
# Copy relevant files
- cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+ @if test -e "$(top_builddir)/VLC-release.app/"; then \
+ cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+ else \
+ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
+ fi
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
# Create disk image
update-po:
rm -f $(top_srcdir)/po/POTFILES.in
{ \
- cd $(top_srcdir) ; \
+ cd $(top_srcdir) && \
echo "# automatically created by make update-po" ; \
echo "" ; \
echo "# main sources" ; \
| sort ; \
echo "" ; \
echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name 'qt4/ui/*.ui'\
+ 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 \
| sort ; \