SUBDIRS = po intl m4 share
DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib
-EXTRA_DIST = FAQ HACKING MAINTAINERS STATUS src/extras/COPYING \
+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
# XXX: these flags could be set in configure.ac.in, 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
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 \
extras/MacOSX/Resources/mpeg2.icns \
extras/MacOSX/Resources/mpeg4.icns \
extras/MacOSX/Resources/vlc.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/stop.png \
- extras/MacOSX/Resources/stepf.png \
- extras/MacOSX/Resources/stepr.png \
+ extras/MacOSX/Resources/vlc_hg.png \
extras/MacOSX/vlc.pbproj/project.pbxproj \
$(NULL)
msvc/libvlc.dsp.in \
msvc/plugins.dsp.in \
msvc/vlc.dsp.in \
- 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 \
+ evc/config.h.in \
evc/modules_builtin_evc.h \
$(NULL)
show-libvlc-sources: FORCE
- @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt) $(SOURCES_libvlc_libc)
+ @echo X: $(SOURCES_libvlc_common) $(SOURCES_libvlc_win32) $(SOURCES_libvlc_dirent) $(SOURCES_libvlc_getopt)
show-libvlc-headers: FORCE
@echo X: $(HEADERS_include) $(HEADERS_include_built)
lib_libvlc_a_SOURCES = $(SOURCES_libvlc)
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/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)
###############################################################################
$(INSTALL) $$i 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) -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
+ 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 ; \
done
+ echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo
endif
if HAVE_WIN32
cp vlc.exe tmp/
$(STRIP) tmp/vlc.exe
cp INSTALL.win32 tmp/INSTALL.txt ; unix2dos tmp/INSTALL.txt
- for file in AUTHORS COPYING ChangeLog README FAQ ; \
+ for file in AUTHORS COPYING ChangeLog README THANKS NEWS ; \
do cp $$file tmp/$${file}.txt ; \
unix2dos tmp/$${file}.txt ; done
mkdir tmp/plugins
fi ; done
# don't include these two
#rm -f tmp/plugins/gtk.so tmp/plugins/sdl.so
- for i in dummy tmp/plugins/*.so ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
+ for i in dummy tmp/plugins/*$(LIBEXT) ; do if test $$i != tmp/plugins/intfwin.so -a $$i != dummy ; then $(STRIP) $$i ; fi ; done
mkdir tmp/share
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/share/ ; done
# Create package
- wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} /CD tmp/nsi
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} tmp/nsi
# Clean up
rm -Rf tmp
cp vlc tmp/vlc/
$(STRIP) tmp/vlc/vlc
xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
- cp AUTHORS COPYING ChangeLog README FAQ tmp/vlc/
+ cp AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/
for file in default8x16.psf default8x9.psf ; \
do cp share/$$file tmp/vlc/share/ ; done
mkdir tmp/vlc/plugins
for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \
$(INSTALL) $$i tmp/vlc/plugins/ ; \
fi ; done
- for i in dummy tmp/vlc/plugins/*.so ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
+ for i in dummy tmp/vlc/plugins/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done
# Create package
mv tmp/vlc tmp/vlc-${VERSION}
(cd tmp ; find vlc-${VERSION} | \
# Copy relevant files
cp -R vlc.app tmp/
- cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ tmp/
+ cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/
# Create disk image
./macosx-dmg 18 "vlc-${VERSION}" tmp/*
projects / vlc / blobdiff