X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=7f896b038971bb4ab469f760f23c3ff68538a41f;hb=c2a934c0ffe3b39060ea28bce715d2dff426ca39;hp=343a8b0861e4a83da212ce82f172dda7778ee708;hpb=5d02f37fe0f39488b84b43bcdd210feab317e082;p=vlc diff --git a/Makefile.am b/Makefile.am index 343a8b0861..7f896b0389 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,13 +8,14 @@ SUBDIRS = po intl m4 share DIST_SUBDIRS = $(SUBDIRS) modules src debian doc ipkg lib -EXTRA_DIST = BUGS 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 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. @@ -31,7 +32,7 @@ ACLOCAL_AMFLAGS = -I m4 # 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 @@ -116,6 +117,9 @@ CFLAGS_nodebug = @CFLAGS_OPTIM_NODEBUG@ endif endif endif +else +# !OPTIM +CFLAGS_optim = @CFLAGS_NOOPTIM@ endif CPPFLAGS_default += $(CPPFLAGS_release) \ @@ -159,6 +163,7 @@ HEADERS_include = \ 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 \ @@ -259,90 +264,47 @@ EXTRA_DIST += \ 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) ############################################################################### -# 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/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) -# -# rule to rebuild vlc.dsp - not for the faint of heart -# -update-vlc.dsp: FORCE - rm -f msvc/vlc.dsp -# Top of the project file - cat msvc/vlc.dsp.in > msvc/vlc.dsp -# The source files - echo '# Begin Group "Source Files" ' >> msvc/vlc.dsp - echo '# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ' >> msvc/vlc.dsp - echo '# Begin Group "vlc" ' >> msvc/vlc.dsp - for file in $(vlc_SOURCES) ; do \ - echo '# Begin Source File ' >> msvc/vlc.dsp ; \ - echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" %' >> msvc/vlc.dsp ; \ - echo '# End Source File ' >> msvc/vlc.dsp ; \ - done ; \ - echo '# End Group ' >> msvc/vlc.dsp - echo '# Begin Group "libvlc" ' >> msvc/vlc.dsp - for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep -v "/.*/"` ; do \ - echo '# Begin Source File ' >> msvc/vlc.dsp ; \ - echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" %' >> msvc/vlc.dsp ; \ - echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" ' >> msvc/vlc.dsp ; \ - echo '# End Source File ' >> msvc/vlc.dsp ; \ - done ; \ - for subdir in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/.*/" | cut -f2 -d/ | sort | uniq` ; do \ - echo '# Begin Group "'$$subdir'" ' >> msvc/vlc.dsp ; \ - for file in `for i in $(SOURCES_libvlc) $(OPT_SOURCES_libvlc_win32) $(OPT_SOURCES_libvlc_dirent) $(OPT_SOURCES_libvlc_getopt) ; do echo $$i ; done | grep "/$$subdir/"` ; do \ - echo '# Begin Source File ' >> msvc/vlc.dsp ; \ - echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" %' >> msvc/vlc.dsp ; \ - echo '# ADD CPP /D "__VLC__" /D PLUGIN_PATH=\"plugins\" /D DATA_PATH=\"share\" ' >> msvc/vlc.dsp ; \ - echo '!IF "$$(CFG)" == "vlc - Win32 Release" ' >> msvc/vlc.dsp ; \ - echo '# PROP Intermediate_Dir "Release\'$$subdir'" ' >> msvc/vlc.dsp ; \ - echo '# PROP Output_Dir "Release\'$$subdir'" ' >> msvc/vlc.dsp ; \ - echo '!ELSEIF "$$(CFG)" == "vlc - Win32 Debug" ' >> msvc/vlc.dsp ; \ - echo '# PROP Intermediate_Dir "Debug\'$$subdir'" ' >> msvc/vlc.dsp ; \ - echo '# PROP Output_Dir "Debug\'$$subdir'" ' >> msvc/vlc.dsp ; \ - echo '!ENDIF ' >> msvc/vlc.dsp ; \ - echo '# End Source File ' >> msvc/vlc.dsp ; \ - done ; \ - echo '# End Group ' >> msvc/vlc.dsp ; \ - done - echo '# End Group ' >> msvc/vlc.dsp - echo '# End Group ' >> msvc/vlc.dsp -# The modules - echo 'no modules yet' -# The headers - echo '# Begin Group "Header Files" ' >> msvc/vlc.dsp - echo '# PROP Default_Filter "h;hpp;hxx;hm;inl" ' >> msvc/vlc.dsp - for file in $(HEADERS_include) $(HEADERS_include_built) ; do \ - echo '# Begin Source File ' >> msvc/vlc.dsp ; \ - echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" %' >> msvc/vlc.dsp ; \ - echo '# End Source File ' >> msvc/vlc.dsp ; \ - done - echo '# Begin Group "vlc" ' >> msvc/vlc.dsp - for file in $(dist_pkginclude_HEADERS) ; do \ - echo '# Begin Source File ' >> msvc/vlc.dsp ; \ - echo $$file | sed -e 's%/%\\%g' -e 's%.*%SOURCE="..\\&" %' >> msvc/vlc.dsp ; \ - echo '# End Source File ' >> msvc/vlc.dsp ; \ - done - echo '# End Group ' >> msvc/vlc.dsp - echo '# End Group ' >> msvc/vlc.dsp -# Bottom of the project file - handles resource files too - cat msvc/vlc.dsp.out >> msvc/vlc.dsp +show-libvlc-sources: FORCE + @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) + +show-libvlc-pkg-headers: FORCE + @echo X: $(dist_pkginclude_HEADERS) ############################################################################### # Building libvlc @@ -355,70 +317,64 @@ lib_LIBRARIES += lib/libvlc.a $(LIBRARIES_libvlc_pic) 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 -SOURCES_libvlc_beos = $(OPT_SOURCES_libvlc_beos) +OPT_SOURCES_libvlc_beos = $(SOURCES_libvlc_beos) endif if HAVE_DARWIN -SOURCES_libvlc_darwin = $(OPT_SOURCES_libvlc_darwin) +OPT_SOURCES_libvlc_darwin = $(SOURCES_libvlc_darwin) endif if HAVE_WIN32 -SOURCES_libvlc_win32 = $(OPT_SOURCES_libvlc_win32) +OPT_SOURCES_libvlc_win32 = $(SOURCES_libvlc_win32) endif if BUILD_DIRENT -SOURCES_libvlc_dirent = $(OPT_SOURCES_libvlc_dirent) +OPT_SOURCES_libvlc_dirent = $(SOURCES_libvlc_dirent) endif if BUILD_GETOPT -SOURCES_libvlc_getopt = $(OPT_SOURCES_libvlc_getopt) -endif -if BUILD_STRNDUP -SOURCES_libvlc_strndup = $(OPT_SOURCES_libvlc_strndup) +OPT_SOURCES_libvlc_getopt = $(SOURCES_libvlc_getopt) endif if BUILD_MOZILLA LIBRARIES_libvlc_pic = lib/libvlc_pic.a endif EXTRA_DIST += \ - $(OPT_SOURCES_libvlc_beos) \ - $(OPT_SOURCES_libvlc_darwin) \ - $(OPT_SOURCES_libvlc_win32) \ - $(OPT_SOURCES_libvlc_dirent) \ - $(OPT_SOURCES_libvlc_getopt) \ - $(OPT_SOURCES_libvlc_strndup) \ + $(SOURCES_libvlc_beos) \ + $(SOURCES_libvlc_darwin) \ + $(SOURCES_libvlc_win32) \ + $(SOURCES_libvlc_dirent) \ + $(SOURCES_libvlc_getopt) \ $(NULL) -OPT_SOURCES_libvlc_beos = \ +SOURCES_libvlc_beos = \ src/misc/beos_specific.cpp \ $(NULL) -OPT_SOURCES_libvlc_darwin = \ - src/misc/darwin_specific.c \ +SOURCES_libvlc_darwin = \ + src/misc/darwin_specific.m \ $(NULL) -OPT_SOURCES_libvlc_win32 = \ +SOURCES_libvlc_win32 = \ src/misc/win32_specific.c \ $(NULL) -OPT_SOURCES_libvlc_dirent = \ +SOURCES_libvlc_dirent = \ src/extras/dirent.c \ src/extras/dirent.h \ $(NULL) -OPT_SOURCES_libvlc_getopt = \ +SOURCES_libvlc_getopt = \ src/extras/getopt.c \ src/extras/getopt.h \ src/extras/getopt1.c \ $(NULL) -OPT_SOURCES_libvlc_strndup = \ - src/extras/strndup.c - $(NULL) - -SOURCES_libvlc = \ +SOURCES_libvlc_common = \ src/libvlc.c \ src/libvlc.h \ src/interface/interface.c \ @@ -453,17 +409,21 @@ SOURCES_libvlc = \ src/misc/configuration.c \ src/misc/netutils.c \ src/misc/iso_lang.c \ - src/misc/iso-639.def \ + src/misc/iso-639_def.h \ src/misc/messages.c \ src/misc/objects.c \ src/misc/variables.c \ src/misc/error.c \ - $(SOURCES_libvlc_beos) \ - $(SOURCES_libvlc_darwin) \ - $(SOURCES_libvlc_win32) \ - $(SOURCES_libvlc_dirent) \ - $(SOURCES_libvlc_getopt) \ - $(SOURCES_libvlc_strndup) \ + src/extras/libc.c \ + $(NULL) + +SOURCES_libvlc = \ + $(SOURCES_libvlc_common) \ + $(OPT_SOURCES_libvlc_beos) \ + $(OPT_SOURCES_libvlc_darwin) \ + $(OPT_SOURCES_libvlc_win32) \ + $(OPT_SOURCES_libvlc_dirent) \ + $(OPT_SOURCES_libvlc_getopt) \ $(NULL) ############################################################################### @@ -515,7 +475,13 @@ vlc.app: vlc $(PLUGIN_FILES) $(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 || true ; \ + done + echo -n "APPLVLC#" >| vlc.app/Contents/PkgInfo endif if HAVE_WIN32 @@ -523,9 +489,95 @@ DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA) 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 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 tmp; then \ + echo "Error: please remove ./tmp, it is in the way"; false; \ + else \ + echo "OK."; mkdir tmp; \ + fi +# Create installation script + cp install-win32 tmp/nsi +# Copy relevant files + 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 THANKS NEWS ; \ + do cp $$file tmp/$${file}.txt ; \ + unix2dos tmp/$${file}.txt ; done + mkdir tmp/plugins + for i in dummy $(PLUGIN_FILES) ; do if test "x$$i" != "xdummy" ; then \ + $(INSTALL) $$i 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/*$(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} tmp/nsi +# Clean up + rm -Rf tmp + +package-beos: +# Check that tmp isn't in the way + @if test -e tmp; then \ + echo "Error: please remove ./tmp, it is in the way"; false; \ + else \ + echo "OK."; mkdir tmp; \ + fi + +# Create dir + mkdir -p tmp/vlc/share +# Copy relevant files + cp vlc tmp/vlc/ + $(STRIP) tmp/vlc/vlc + xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc + 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/*$(LIBEXT) ; do if test $$i != dummy ; then $(STRIP) $$i ; fi ; done +# Create package + mv tmp/vlc tmp/vlc-${VERSION} + (cd tmp ; find vlc-${VERSION} | \ + zip -9 -@ vlc-${VERSION}-BeOS-x86.zip ) + mv tmp/vlc-${VERSION}-BeOS-x86.zip . +# Clean up + rm -Rf tmp + +package-macosx: +# Check that tmp isn't in the way + @if test -e tmp; then \ + echo "Error: please remove ./tmp, it is in the way"; false; \ + else \ + echo "OK."; mkdir tmp; \ + fi + +# Copy relevant files + cp -R vlc.app tmp/ + cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS tmp/ + +# Create disk image + ./macosx-dmg 18 "vlc-${VERSION}" tmp/* + +# Clean up + rm -Rf tmp + ############################################################################### # Building the Mozilla plugin ############################################################################### @@ -566,7 +618,7 @@ if UNTRUE 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) @@ -602,7 +654,7 @@ DATA_npvlc_rc = $(noinst_mozilla_npvlc_rc_DATA) 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 mozilla -i $< -o $@ endif endif