# 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
+DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib autotools
+
+EXTRA_DIST = \
+ HACKING \
+ INSTALL.win32 \
+ MAINTAINERS \
+ Modules.am \
+ README.MacOSX.rtf \
+ bootstrap \
+ install-win32 \
+ src/extras/COPYING \
+ toolbox \
+ vlc.ebuild \
+ vlc.spec \
+ vlc.spec.redhat \
+ $(NULL)
-EXTRA_DIST = BUGS FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
- INSTALL.win32 README.MacOSX.rtf vlc.spec install-win32 \
- Modules.am macosx-dmg \
- configure.ac.in mkinstalldirs bootstrap
MOSTLYCLEANFILES =
BUILT_SOURCES =
SUFFIXES =
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
-# XXX: these flags could be set in configure.ac.in, but we set them here
+# XXX: these flags could be set in configure.ac, but we set them here
# because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = foreign dist-bzip2 subdir-objects
+AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects
###############################################################################
# Compilation flags for debug mode, profiling, and others
CFLAGS_default =
CXXFLAGS_default =
OBJCFLAGS_default =
-LDFLAGS_default =
+LDFLAGS_default = $(LDFLAGS_gprof)
CPPFLAGS_pic = $(CPPFLAGS_default)
CFLAGS_pic = $(CFLAGS_default) @CFLAGS_pics@
CXXFLAGS_builtin_pic = $(CXXFLAGS_builtin) $(CXXFLAGS_pic)
OBJCFLAGS_builtin_pic = $(OBJCFLAGS_builtin) $(OBJCFLAGS_pic)
LDFLAGS_builtin_pic = $(LDFLAGS_builtin) $(LDFLAGS_pic)
-L_builtin_pic = $(L_builtin) $(L_pic)
+L_builtin_pic =
# On Linux and Solaris, activate 64-bit off_t (by default under BSD)
CPPFLAGS_default += -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE
endif
if GPROF
CPPFLAGS_gprof = -DGPROF
-CFLAGS_gprof = -finstrument-functions
+CFLAGS_gprof = -pg
+LDFLAGS_gprof = -pg
endif
if CPROF
CPPFLAGS_cprof = -DCPROF
-CFLAGS_cprof = -pg
+CFLAGS_cprof = -finstrument-functions
endif
if OPTIM
CFLAGS_optim = @CFLAGS_OPTIM@ @CFLAGS_TUNING@
endif
endif
endif
+else
+# !OPTIM
+CFLAGS_optim = @CFLAGS_NOOPTIM@
endif
CPPFLAGS_default += $(CPPFLAGS_release) \
include/darwin_specific.h \
include/codecs.h \
include/error.h \
+ include/encoder.h \
include/input_ext-dec.h \
include/input_ext-intf.h \
include/input_ext-plugins.h \
include/interface.h \
include/intf_eject.h \
include/iso_lang.h \
+ include/httpd.h \
include/main.h \
include/mmx.h \
include/modules.h \
include/modules_inner.h \
include/mtime.h \
- include/netutils.h \
include/network.h \
include/os_specific.h \
include/stream_control.h \
include/stream_output.h \
+ include/announce.h \
include/variables.h \
include/video.h \
include/video_output.h \
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 = \
$(NULL)
include/vlc_symbols.h: Makefile $(HEADERS_include)
- rm -f $@.in
- echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> $@.in
- echo 'struct module_symbols_t {' >> $@.in
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ \1 (* \2_inner) \3;/' >> $@.in
- echo '};' >> $@.in
- echo '#ifdef __PLUGIN__' >> $@.in
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/# define \2 p_symbols->\2_inner/' >> $@.in
- echo '#endif /* __PLUGIN__ */' >> $@.in
- mv -f $@.in $@
+ cd $(srcdir) && ./toolbox --update-includes $(BUILTINS)
src/misc/modules_plugin.h: Makefile src/misc/modules_plugin.h.in $(HEADERS_include)
- rm -f $@.tmp && cp $@.in $@.tmp
- sed -e 's#.*\$[I][d]:.*# * Automatically generated from '$@'.in by bootstrap#' < $@.in > $@.tmp
- echo '#define STORE_SYMBOLS( p_symbols ) \' >> $@.tmp
- cat $(HEADERS_include) | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/ (p_symbols)->\2_inner = \2; \\/' >> $@.tmp
- echo '' >> $@.tmp
- mv -f $@.tmp $@
+ cd $(srcdir) && ./toolbox --update-includes $(BUILTINS)
src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in
- rm -f $@.tmp && cp $@.in $@.tmp
-if HAVE_BUILTINS
- for i in $(BUILTINS) ; do echo "int vlc_entry__"`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"( module_t* );" >>$@.tmp; done
- echo "" >> $@.tmp
-endif
- echo "#define ALLOCATE_ALL_BUILTINS() \\" >> $@.tmp
- echo " do \\" >> $@.tmp
- echo " { \\" >> $@.tmp
-if HAVE_BUILTINS
- for i in $(BUILTINS) ; do echo " ALLOCATE_BUILTIN("`echo $$i | sed -e 'y@/@_@' -e 's@\..*@@'`"); \\" >> $@.tmp ; done
-endif
- echo " } while( 0 );" >> $@.tmp
- echo "" >> $@.tmp
- mv -f $@.tmp $@
+ cd $(srcdir) && ./toolbox --update-includes $(BUILTINS)
# These dependencies are mandatory
$(SOURCES): include/vlc_symbols.h
###############################################################################
intl/libintl.a: FORCE
- cd intl && $(MAKE)
+ cd $(srcdir)/intl && $(MAKE)
if BUILD_INTL
LIB_intl = intl/libintl.a
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/a52.icns \
+ extras/MacOSX/Resources/aac.icns \
+ extras/MacOSX/Resources/asf.icns \
+ extras/MacOSX/Resources/asx.icns \
+ extras/MacOSX/Resources/avi.icns \
+ extras/MacOSX/Resources/bin.icns \
+ extras/MacOSX/Resources/cue.icns \
+ extras/MacOSX/Resources/dat.icns \
extras/MacOSX/Resources/divx.icns \
+ extras/MacOSX/Resources/dv.icns \
extras/MacOSX/Resources/generic.icns \
+ extras/MacOSX/Resources/m3u.icns \
+ extras/MacOSX/Resources/mov.icns \
+ extras/MacOSX/Resources/mp3.icns \
+ extras/MacOSX/Resources/mp4.icns \
extras/MacOSX/Resources/mpeg.icns \
extras/MacOSX/Resources/mpeg1.icns \
extras/MacOSX/Resources/mpeg2.icns \
extras/MacOSX/Resources/mpeg4.icns \
+ extras/MacOSX/Resources/mpg.icns \
+ extras/MacOSX/Resources/ogg.icns \
+ extras/MacOSX/Resources/ogm.icns \
+ extras/MacOSX/Resources/pls.icns \
+ extras/MacOSX/Resources/srt.icns \
+ extras/MacOSX/Resources/sub.icns \
extras/MacOSX/Resources/vlc.icns \
+ extras/MacOSX/Resources/vob.icns \
+ extras/MacOSX/Resources/wma.icns \
+ extras/MacOSX/Resources/wmv.icns \
+ extras/MacOSX/Resources/back.png \
+ extras/MacOSX/Resources/begin.png \
+ extras/MacOSX/Resources/end.png \
+ extras/MacOSX/Resources/forw.png \
+ extras/MacOSX/Resources/list.png \
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/stepf.png \
- extras/MacOSX/Resources/stepr.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)
###############################################################################
-# MS Visual Studio project
+# MS Visual Studio and eMbedded Visual Studio projects
###############################################################################
EXTRA_DIST += \
- msvc/vlc.dsp \
msvc/vlc.dsw \
+ msvc/libvlc.dsp.in \
+ msvc/plugins.dsp.in \
msvc/vlc.dsp.in \
- msvc/vlc.dsp.out \
- msvc/vlc.vcp \
- msvc/vlc.vcw \
- msvc/vlc.vcp.in \
- msvc/vlc.vcp.out \
- msvc/config.h \
+ 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/vlc.c \
+ evc/config.h.in \
+ evc/modules_builtin_evc.h \
$(NULL)
-show-vlc-sources: FORCE
- @echo X: $(vlc_SOURCES)
-
-show-libvlc-sources: FORCE
- @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
-
-show-libvlc-headers: FORCE
- @echo X: $(HEADERS_include) $(HEADERS_include_built)
-
-show-libvlc-pkg-headers: FORCE
- @echo X: $(dist_pkginclude_HEADERS)
+dist-hook:
+ mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
+ cd $(distdir) && $(srcdir)/toolbox --update-vc
###############################################################################
# Building libvlc
lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic)
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
+dist_lib_libvlc_a_SOURCES = src/misc/modules_plugin.h
lib_libvlc_a_CFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CFLAGS_default) @CFLAGS_vlc@
lib_libvlc_a_CXXFLAGS = $(CPPFLAGS_default) -D__VLC__ $(CXXFLAGS_default)
+lib_libvlc_a_OBJCFLAGS = $(CPPFLAGS_default) -D__VLC__ $(OBJCFLAGS_default)
lib_libvlc_pic_a_SOURCES = $(SOURCES_libvlc)
lib_libvlc_pic_a_CFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CFLAGS_pic) @CFLAGS_vlc@
lib_libvlc_pic_a_CXXFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(CXXFLAGS_pic)
+lib_libvlc_pic_a_OBJCFLAGS = $(CPPFLAGS_pic) -D__VLC__ $(OBJCFLAGS_pic)
if HAVE_BEOS
OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos)
if BUILD_GETOPT
OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt)
endif
-if BUILD_LIBC
-OPT_SOURCES_libvlc_libc = $(SOURCES_libvlc_libc)
-endif
if BUILD_MOZILLA
LIBRARIES_libvlc_pic = lib/libvlc_pic.a
endif
$(SOURCES_libvlc_win32) \
$(SOURCES_libvlc_dirent) \
$(SOURCES_libvlc_getopt) \
- $(SOURCES_libvlc_libc) \
$(NULL)
SOURCES_libvlc_beos = \
$(NULL)
SOURCES_libvlc_darwin = \
- src/misc/darwin_specific.c \
+ src/misc/darwin_specific.m \
$(NULL)
SOURCES_libvlc_win32 = \
src/extras/getopt1.c \
$(NULL)
-SOURCES_libvlc_libc = \
- src/extras/libc.c
- $(NULL)
-
SOURCES_libvlc_common = \
src/libvlc.c \
src/libvlc.h \
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 \
src/audio_output/output.c \
src/audio_output/intf.c \
src/stream_output/stream_output.c \
+ src/stream_output/announce.c \
src/misc/mtime.c \
src/misc/modules.c \
src/misc/threads.c \
src/misc/cpu.c \
src/misc/configuration.c \
- src/misc/netutils.c \
src/misc/iso_lang.c \
src/misc/iso-639_def.h \
src/misc/messages.c \
src/misc/objects.c \
src/misc/variables.c \
src/misc/error.c \
+ src/extras/libc.c \
$(NULL)
SOURCES_libvlc = \
$(OPT_SOURCES_libvlc_win32) \
$(OPT_SOURCES_libvlc_dirent) \
$(OPT_SOURCES_libvlc_getopt) \
- $(OPT_SOURCES_libvlc_libc) \
$(NULL)
###############################################################################
DEPENDENCIES_vlc = lib/libvlc.a $(L_builtin) $(DATA_win32_rc) $(LIB_intl)
vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc)
- @rm -f vlc$(EXEEXT)
+ @rm -f $(srcdir)/vlc$(EXEEXT)
$(LINK) $(vlc_LDFLAGS) $(vlc_OBJECTS) $(vlc_LDADD) $(LIBS)
+
if HAVE_BEOS
- xres -o $@ ./share/vlc_beos.rsrc
+ xres -o $@ $(srcdir)/share/vlc_beos.rsrc
mimeset -f $@
+ rm -Rf $(srcdir)/locale ; mkdir $(srcdir)/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p $(srcdir)/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo \
+ $(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
endif
# Install the symlinks
if HAVE_DARWIN
# Create the MacOS X app
-vlc_app_DATA = vlc.app
+vlc_app_DATA = VLC.app
vlc_appdir = $(bindir)
-vlc.app: vlc $(PLUGIN_FILES)
- rm -Rf vlc.app
- cd extras/MacOSX ; pbxbuild | grep -v '^[ \t]' | grep -v "^$$"
- cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
- $(INSTALL) -d vlc.app/Contents/MacOS
- $(INSTALL) vlc vlc.app/Contents/MacOS/
- $(INSTALL) -d vlc.app/Contents/MacOS/modules
+VLC.app: vlc $(PLUGIN_FILES)
+ rm -Rf VLC.app
+ cd $(srcdir)/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+ cp -r $(srcdir)/extras/MacOSX/build/vlc.bundle $(srcdir)/VLC.app
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS
+ $(INSTALL) vlc $(srcdir)/VLC.app/Contents/MacOS/VLC
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/modules
for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
- $(INSTALL) $$i vlc.app/Contents/MacOS/modules/ ; \
+ $(INSTALL) $(srcdir)/$$i \
+ $(srcdir)/VLC.app/Contents/MacOS/modules/ ; \
fi ; done
- $(INSTALL) -d vlc.app/Contents/MacOS/share
- $(INSTALL) -m 644 share/*.psf vlc.app/Contents/MacOS/share
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/share
+ $(INSTALL) -m 644 $(srcdir)/share/*.psf $(srcdir)/share/*.rle \
+ $(srcdir)/VLC.app/Contents/MacOS/share
+ $(INSTALL) -d $(srcdir)/VLC.app/Contents/MacOS/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(srcdir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology $(srcdir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ done
+ printf "APPLVLC#" >| $(srcdir)/VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT)
noinst_share_vlc_win32_rcdir = $(libdir)
share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc
- $(WINDRES) -i $< -o $@
+ $(WINDRES) --include-dir $(srcdir)/share -i $< -o $@
endif
+###############################################################################
+# 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.
+#
+# Check that tmp isn't in the way
+package-win32:
+ @if test -e $(srcdir)/tmp; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir $(srcdir)/tmp; \
+ fi
+# Create installation script
+ cp $(srcdir)/install-win32 $(srcdir)/tmp/nsi
+# Copy relevant files
+ cp $(srcdir)/vlc$(EXEEXT) $(srcdir)/tmp/
+ $(STRIP) $(srcdir)/tmp/vlc$(EXEEXT)
+ cp $(srcdir)/INSTALL.win32 $(srcdir)/tmp/INSTALL.txt
+ unix2dos $(srcdir)/tmp/INSTALL.txt
+ for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
+ do cp $(srcdir)/$$file $(srcdir)/tmp/$${file}.txt ; \
+ unix2dos $(srcdir)/tmp/$${file}.txt ; done
+
+ mkdir $(srcdir)/tmp/plugins
+ for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
+ $(INSTALL) $(srcdir)/$$i $(srcdir)/tmp/plugins/ ; \
+ fi ; done
+
+ for i in dummy $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
+ do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+
+ mkdir $(srcdir)/tmp/share
+ cp $(srcdir)/share/*.rle $(srcdir)/tmp/share/ ;
+
+ mkdir $(srcdir)/tmp/locale
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p $(srcdir)/tmp/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo \
+ $(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
+
+ mkdir -p $(srcdir)/tmp/skins/default
+ for i in $(srcdir)/share/skins/default/*.*; do \
+ cp $$i $(srcdir)/tmp/skins/default/ || true ; \
+ done
+ for i in $(srcdir)/doc/skins/*.txt; do \
+ cp $$i $(srcdir)/tmp/skins/ || true ; \
+ done
+
+# Create package
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
+# Clean up
+ rm -Rf $(srcdir)/tmp
+
+package-beos:
+# Check that tmp isn't in the way
+ @if test -e $(srcdir)/tmp; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir $(srcdir)/tmp; \
+ fi
+
+# Copy relevant files
+ mkdir -p $(srcdir)/tmp/vlc
+ cd $(srcdir) && \
+ cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
+# We cannot use ${PLUGIN_FILES}, it looks like it is too long for the BeOS shell...
+ if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
+ mkdir -p $(srcdir)/tmp/vlc/plugins; \
+ find $(srcdir)/modules -name "lib*_plugin.so" | xargs -i{} cp {} $(srcdir)/tmp/vlc/plugins/; \
+ fi
+ for i in $(ALL_LINGUAS); do \
+ mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ done
+ mkdir -p $(srcdir)/tmp/vlc/share
+ cp $(srcdir)/share/*.rle $(srcdir)/tmp/vlc/share/
+
+# Create package with debug symbols
+ mimeset -f $(srcdir)/tmp/vlc/* $(srcdir)/tmp/vlc/*/*
+ mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION}
+ (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/
+
+# Create package without debug symbols
+ strip $(srcdir)/tmp/vlc-${VERSION}/vlc
+ if [ -d $(srcdir)/tmp/vlc-${VERSION}/plugins ]; then \
+ strip $(srcdir)/tmp/vlc-${VERSION}/plugins/lib*_plugin.so; \
+ fi
+ xres -o $(srcdir)/tmp/vlc-${VERSION}/vlc $(srcdir)/share/vlc_beos.rsrc
+ mimeset -f $(srcdir)/tmp/vlc-${VERSION}/* $(srcdir)/tmp/vlc-${VERSION}/*/*
+ (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
+ mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/
+
+# Clean up
+ rm -Rf $(srcdir)/tmp
+
+package-macosx:
+# Check that tmp isn't in the way
+ @if test -e $(srcdir)/tmp; then \
+ echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir $(srcdir)/tmp; \
+ fi
+
+# Copy relevant files
+ cp -R $(srcdir)/VLC.app $(srcdir)/tmp/
+ cd $(srcdir) && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
+
+# Create disk image
+ $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*
+
+# Clean up
+ rm -Rf $(srcdir)/tmp
+
###############################################################################
# Building the Mozilla plugin
###############################################################################
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
noinst_LIBRARIES_mozilla = mozilla/libplugin.a
endif
-mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla) $(BUILT_SOURCES_mozilla)
+mozilla_libplugin_a_SOURCES = $(SOURCES_mozilla)
mozilla_libplugin_a_CFLAGS = $(CPPFLAGS_pic) $(CFLAGS_pic) \
$(CPPFLAGS_mozilla) $(CFLAGS_mozilla) \
$(CPPFLAGS_mozilla_EXTRA)
noinst_mozilla_npvlc_rc_DATA = mozilla/npvlc_rc.$(OBJEXT)
noinst_mozilla_npvlc_rcdir = $(libdir)
mozilla/npvlc_rc.$(OBJEXT): mozilla/npvlc_rc.rc
- $(WINDRES) -i $< -o $@
+ $(WINDRES) --include-dir $(srcdir)/mozilla -i $< -o $@
endif
endif
projects / vlc / blobdiff