include/darwin_specific.h \
include/charset.h \
include/codecs.h \
- include/encoder.h \
include/ninput.h \
include/input_ext-dec.h \
include/input_ext-intf.h \
include/stream_output.h \
include/variables.h \
include/video_output.h \
+ include/vlc_block.h \
include/vlc_common.h \
include/vlc_config.h \
include/vlc_cpu.h \
src/stream_output/stream_output.c \
src/misc/charset.c \
src/misc/mtime.c \
+ src/misc/block.c \
src/misc/modules.c \
src/misc/threads.c \
src/misc/cpu.c \
vlc_app_DATA = VLC.app
vlc_appdir = $(bindir)
VLC.app: vlc
- cd $(top_builddir)
- rm -Rf VLC.app
- mkdir extras || true
- cp -r $(srcdir)/extras/MacOSX extras || true
- cd extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
- cd $(top_builddir)
- 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/modules
+ @if test -e "$(top_builddir)/tmp"; then \
+ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
+ fi
+ rm -Rf $(top_builddir)/VLC.app
+ cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+ for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
+ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
+ done
+ mkdir -p $(top_builddir)/tmp/modules/audio_output
+ cp $(srcdir)/modules/audio_output/coreaudio.c \
+ $(top_builddir)/tmp/modules/audio_output/coreaudio.c
+ mkdir -p $(top_builddir)/tmp/modules/gui/macosx
+ for i in \
+ about.h \
+ about.m \
+ applescript.h \
+ applescript.m \
+ controls.h \
+ controls.m \
+ info.h \
+ info.m \
+ intf.h \
+ intf.m \
+ macosx.m \
+ misc.h \
+ misc.m \
+ open.h \
+ open.m \
+ output.h \
+ output.m \
+ playlist.h \
+ playlist.m \
+ prefs.h \
+ prefs.m \
+ vout.h \
+ vout.m; do \
+ cp "$(srcdir)/modules/gui/macosx/$$i" \
+ $(top_builddir)/tmp/modules/gui/macosx; \
+ done
+ cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'
+ cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
+ $(top_builddir)/VLC.app
+ rm -Rf $(top_builddir)/tmp
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
+ $(INSTALL) $(top_builddir)/vlc \
+ $(top_builddir)/VLC.app/Contents/MacOS/VLC
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
- if test -n "$$i" ; then $(INSTALL) "$$i$(LIBEXT)" \
- "VLC.app/Contents/MacOS/modules" ; \
+ if test -n "$$i" ; \
+ then $(INSTALL) "$$i$(LIBEXT)" \
+ "$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done
- $(INSTALL) -d VLC.app/Contents/MacOS/share
- $(INSTALL) -d VLC.app/Contents/MacOS/share/http
- $(INSTALL) -m 644 $(srcdir)/share/http/*.html VLC.app/Contents/MacOS/share/http
- $(INSTALL) -d VLC.app/Contents/MacOS/share/http/admin
- $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html VLC.app/Contents/MacOS/share/http/admin
- $(INSTALL) -d VLC.app/Contents/MacOS/locale
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http
+ $(INSTALL) -m 644 $(srcdir)/share/http/*.html \
+ $(top_builddir)/VLC.app/Contents/MacOS/share/http
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
+ $(INSTALL) -m 644 $(srcdir)/share/http/admin/*.html \
+ $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
+ $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
for i in $(ALL_LINGUAS); do \
- mkdir -p VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
- cp $(srcdir)/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 ; \
+ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
+ cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
+ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/InfoPlist.strings \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/MainMenu.nib \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
+ ln -sf ../English.lproj/vlc.scriptTerminology \
+ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \
done
- printf "APPLVLC#" >| VLC.app/Contents/PkgInfo
+ printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
endif
if HAVE_WIN32
# 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"; \
+package-win32-base:
+ @if test -e "$(srcdir)/vlc-${VERSION}"; then \
+ echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(srcdir)/tmp"; \
+ echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
fi
# Create installation script
- cp "$(srcdir)/install-win32" "$(srcdir)/tmp/nsi"
+ cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
# Copy relevant files
- cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/tmp/"
- $(STRIP) "$(srcdir)/tmp/vlc$(EXEEXT)"
+ cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
+ $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
- do cp "$(srcdir)/$$file" "$(srcdir)/tmp/$${file}.txt" ; \
- unix2dos "$(srcdir)/tmp/$${file}.txt" ; done
+ do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
+ unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
- mkdir -p "$(srcdir)/tmp/plugins"
+ mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
- $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" "$(srcdir)/tmp/plugins/" ; \
+ $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
+ "$(srcdir)/vlc-${VERSION}/plugins/" ; \
fi ; done
- for i in "" $(srcdir)/tmp/plugins/*$(LIBEXT) ; \
+ for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
- mkdir $(srcdir)/tmp/locale
+ mkdir $(srcdir)/vlc-${VERSION}/locale
for i in $(ALL_LINGUAS); do \
- mkdir -p "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES" ; \
+ mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
cp "$(srcdir)/po/$${i}.gmo" \
- "$(srcdir)/tmp/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
+ "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+ || true ; \
done
- mkdir -p $(srcdir)/tmp/skins/default
+ mkdir -p $(srcdir)/vlc-${VERSION}/skins/default
for i in $(srcdir)/share/skins/default/*.*; do \
- cp $$i $(srcdir)/tmp/skins/default/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \
done
for i in $(srcdir)/doc/skins/*.txt; do \
- cp $$i $(srcdir)/tmp/skins/ || true ; \
+ cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
done
- mkdir -p "$(srcdir)/tmp/http/admin"
- cp $(srcdir)/share/http/*.html $(srcdir)/tmp/http/ ;
- cp $(srcdir)/share/http/admin/*.html $(srcdir)/tmp/http/admin/ ;
- cp $(srcdir)/share/http/admin/.access $(srcdir)/tmp/http/admin/ ;
+ mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
+ cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
+ cp $(srcdir)/share/http/admin/*.html \
+ $(srcdir)/vlc-${VERSION}/http/admin/ ;
+ cp $(srcdir)/share/http/admin/.access \
+ $(srcdir)/vlc-${VERSION}/http/admin/ ;
+
+package-win32-base-exe:
+# Create package
+ wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
+ -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi
+package-win32-base-zip:
# Create package
- wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe -- /DVERSION=${VERSION} $(srcdir)/tmp/nsi
+ zip -r vlc-${VERSION}-win32.zip vlc-${VERSION}
+
+package-win32-exe: package-win32-base package-win32-base-exe
# Clean up
- rm -Rf $(srcdir)/tmp
+ rm -Rf $(srcdir)/vlc-${VERSION}
+
+package-win32-zip: package-win32-base package-win32-base-zip
+# Clean up
+ rm -Rf $(srcdir)/vlc-${VERSION}
+
+package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
+# Clean up
+ rm -Rf $(srcdir)/vlc-${VERSION}
package-beos:
# Check that tmp isn't in the way
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"; \
+ @if test -e "$(top_builddir)/tmp"; then \
+ echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
false; \
else \
- echo "OK."; mkdir -p "$(srcdir)/tmp"; \
+ echo "OK."; mkdir -p "$(top_builddir)/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/
+ cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/tmp/"
+ cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
# Create disk image
- $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(srcdir)/tmp/*
+ $(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/*
# Clean up
- rm -Rf $(srcdir)/tmp
+ rm -Rf $(top_builddir)/tmp
###############################################################################
# Stamp rules