# Automake targets and declarations
###############################################################################
+NULL =
+
# SUBDIRS stores the directories where a "make" is required when building
# something. DIST_SUBDIRS stores the directories where nothing is built but
# which have makefiles with distribution information.
SUBDIRS = po intl m4 share
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
-EXTRA_DIST = HACKING MAINTAINERS src/extras/COPYING \
- INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
- Modules.am macosx-dmg \
- configure.ac.in mkinstalldirs bootstrap
+EXTRA_DIST = \
+ HACKING \
+ INSTALL.win32 \
+ MAINTAINERS \
+ Modules.am \
+ README.MacOSX.rtf \
+ bootstrap \
+ configure.ac.in \
+ install-win32 \
+ src/extras/COPYING \
+ toolbox \
+ vlc.spec \
+ $(NULL)
+
MOSTLYCLEANFILES =
BUILT_SOURCES =
SUFFIXES =
-NULL =
# List of programs, libraries and headers that need to be built and/or
# distributed. Initialized to empty because we'll use += later.
include/vlc_playlist.h \
include/vlc_threads.h \
include/vlc_threads_funcs.h \
+ include/vout_synchro.h \
include/win32_specific.h \
+ include/osd.h \
$(NULL)
HEADERS_include_built = \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
+ extras/MacOSX/Resources/English.lproj/vlc.scriptTerminology \
extras/MacOSX/Resources/divx.icns \
extras/MacOSX/Resources/generic.icns \
extras/MacOSX/Resources/mpeg.icns \
extras/MacOSX/Resources/pause.png \
extras/MacOSX/Resources/play.png \
extras/MacOSX/Resources/prefs.png \
+ extras/MacOSX/Resources/slow.png \
extras/MacOSX/Resources/stop.png \
extras/MacOSX/Resources/vlc_hg.png \
+ extras/MacOSX/Resources/about_bg.png \
+ extras/MacOSX/Resources/vlc.scriptSuite \
+ extras/MacOSX/Resources/README \
extras/MacOSX/vlc.pbproj/project.pbxproj \
+ extras/MacOSX/macosx-dmg \
$(NULL)
###############################################################################
src/video_output/video_text.c \
src/video_output/video_text.h \
src/video_output/vout_subpictures.c \
+ src/video_output/vout_synchro.c \
src/audio_output/common.c \
src/audio_output/dec.c \
src/audio_output/filters.c \
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
@rm -f vlc$(EXEEXT)
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
+
if HAVE_BEOS
xres -o $@ ./share/vlc_beos.rsrc
mimeset -f $@
+ $(INSTALL) -d locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
endif
# Install the symlinks
vlc_appdir = $(bindir)
VLC.app: vlc $(PLUGIN_FILES)
rm -Rf VLC.app
- cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
+ cd extras/MacOSX ; pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
cp -r extras/MacOSX/build/vlc.bundle ./VLC.app
$(INSTALL) -d VLC.app/Contents/MacOS
$(INSTALL) vlc VLC.app/Contents/MacOS/VLC
$(INSTALL) -d VLC.app/Contents/MacOS/share
$(INSTALL) -m 644 share/*.psf share/*.rle VLC.app/Contents/MacOS/share
$(INSTALL) -d VLC.app/Contents/MacOS/locale
- for i in $(CATALOGS); do \
- mkdir -p VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES ; \
- cp po/$$i VLC.app/Contents/MacOS/locale/$${i%.gmo}/LC_MESSAGES/vlc.mo || true ; \
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp po/$${i}.gmo VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology VLC.app/Contents/Resources/$${i}.lproj ; \
done
echo -n "APPLVLC#" >| VLC.app/Contents/PkgInfo
endif
for i in dummy tmp/plugins/*$(LIBEXT) ; \
do if test $$i != tmp/plugins/libwin32_plugin$(LIBEXT) \
-a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
mkdir tmp/share
cp share/*.rle tmp/share/ ;
cp po/$${i}.gmo tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
done
+ mkdir -p tmp/skins/default
+ for i in share/skins/default/*.*; do \
+ cp $$i tmp/skins/default/ || true ; \
+ done
+ for i in doc/skins/*.txt; do \
+ cp $$i tmp/skins/ || true ; \
+ done
+
cd doc/faq ; $(MAKE) html ; cd ../.. ;
cp doc/faq/index.html tmp/FAQ.htm ;
cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
# Create disk image
- ./macosx-dmg 18 "vlc-${VERSION}" tmp/*
+ ./extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" tmp/*
# Clean up
rm -Rf tmp
mozilla/vlcplugin.h \
mozilla/vlcpeer.cpp \
mozilla/vlcpeer.h \
- mozilla/classinfo.h \
+ mozilla/support/classinfo.h \
$(SOURCES_mozilla_win32) \
+ $(SOURCES_mozilla_macosx) \
$(SOURCES_mozilla_unix) \
$(NULL)
# under Win32 and npunix.c under Unix.
if HAVE_WIN32
LIBRARIES_mozilla = mozilla/npvlc$(LIBEXT)
-SOURCES_mozilla_win32 = mozilla/npwin.cpp
+SOURCES_mozilla_win32 = mozilla/support/npwin.cpp
CPPFLAGS_mozilla_EXTRA = -DXP_WIN -DXP_WIN32
else
+if HAVE_DARWIN
+# We don't define LIBRARIES_mozilla because we'll be using project builder
+SOURCES_mozilla_macosx = mozilla/support/npmac.cpp
+else
LIBRARIES_mozilla = mozilla/libvlcplugin$(LIBEXT)
-SOURCES_mozilla_unix = mozilla/npunix.c
+SOURCES_mozilla_unix = mozilla/support/npunix.c
+endif
endif
if BUILD_MOZILLA
projects / vlc / blobdiff