vlc_DEPENDENCIES = $(DATA_win32_rc)
-vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL)
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
if !HAVE_PLUGINS
vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
endif
$(top_builddir)/VLC-release.app/Contents/MacOS/VLC
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+ $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
@executable_path/lib/libvlc.dylib \
for i in $(srcdir)/share/luameta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
done ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf
+ for i in $(srcdir)/share/luaintf/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \
+ done ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules
+ for i in $(srcdir)/share/luaintf/modules/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \
+ done ; \
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
+ $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
+ for i in $(srcdir)/share/http-lua/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/dialogs/* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/js/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/old/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/images/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
+ done ; \
+ for i in $(srcdir)/share/http-lua/requests/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
+ done ; \
+ $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
$(top_builddir)/VLC.app/Contents/MacOS/VLC
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
- $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+ $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
@executable_path/lib/libvlc.dylib \
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/"
- for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
- do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
- unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+ for file in AUTHORS MAINTAINERS THANKS ; \
+ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done;
+ for file in NEWS COPYING README; \
+ do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-${VERSION}/$${file}.txt"; done
+ unix2dos "$(top_builddir)/vlc-${VERSION}/"*.txt
mkdir $(top_builddir)/vlc-${VERSION}/locale
cat $(top_srcdir)/po/LINGUAS | while read i; do \
|| true ; \
done
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/images"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/requests"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/js"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/dialogs"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/vlm"
+ mkdir -p "$(top_builddir)/vlc-${VERSION}/http-lua/old/admin"
+ cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-${VERSION}/http-lua/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.html ;
+ cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/.hosts ;
+ cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-${VERSION}/http-lua/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/*.css ;
+ cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-${VERSION}/http-lua/js/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/js/*.js ;
+ cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/* ;
+ cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/dialogs/.hosts ;
+ cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-${VERSION}/http-lua/ ;
+ cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-${VERSION}/http-lua/images/
+ cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-${VERSION}/http-lua/requests/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/*.xml ;
+ cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/requests/readme.txt ;
+
+ cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/*.html ;
+ cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-${VERSION}/http-lua/old/ ;
+ cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-${VERSION}/http-lua/old/ ;
+ cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-${VERSION}/http-lua/old/ ;
+ cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/vlm/*.html ;
+ cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ;
+ unix2dos $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/*.html ;
+ cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-${VERSION}/http-lua/old/admin/ ;
+
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
for i in $(srcdir)/share/luameta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \
done ;
+ $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf
+ for i in $(srcdir)/share/luaintf/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/`basename $${i}` ; \
+ done ;
+ $(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaintf/modules
+ for i in $(srcdir)/share/luaintf/modules/*.* ; do \
+ $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaintf/modules/`basename $${i}` ; \
+ done ;
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
echo "Create package directory: vlc-${VERSION}/";
mkdir -p "$(top_builddir)/vlc-${VERSION}/";
+# For now, export the framework for third parties, from here
+ (cd $(top_builddir)/extras/MacOSX/Framework && xcodebuild);
+ cp -r $(top_builddir)/extras/MacOSX/Framework/build/Release/VLC.framework $(top_builddir)/vlc-${VERSION}/VLC.framework
+
# Copy relevant files
@if test -e "$(top_builddir)/VLC-release.app/"; then \
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
hdiutil attach -readwrite -noverify -noautoopen "$(top_builddir)/vlc-${VERSION}.dmg" -mountpoint "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
bless --folder "$(top_builddir)/vlcmnt/vlc-${VERSION}/" --openfolder "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
sleep 1 # Make sure operation completes
-
-# Place the image disk finder icon at the correct place
-# Note: careful here the finder does some weird things
-# sometimes. delays in the script should prevent those.
cd "$(srcdir)"
- osascript -e "tell application \"Finder\"" \
- -e " set f to POSIX file (\"$(top_builddir)/vlcmnt/vlc-${VERSION}/\" as string) as alias" \
- -e " tell folder f" \
- -e " open" \
- -e " tell container window" \
- -e " set toolbar visible to false" \
- -e " set statusbar visible to false" \
- -e " set current view to icon view" \
- -e " delay 1 -- Sync" \
- -e " set the bounds to {50, 100, 1000, 1000} -- Big size so the finder won't do silly things" \
- -e " end tell" \
- -e " delay 1 -- Sync" \
- -e " set icon size of the icon view options of container window to 128" \
- -e " set arrangement of the icon view options of container window to not arranged" \
- -e " set background picture of the icon view options of container window to file \".background:background.png\"" \
- -e " set position of item \"VLC.app\" to {100, 20}" \
- -e " set position of item \"Applications\" to {310, 20}" \
- -e " set position of item \"Goodies\" to {40, 200}" \
- -e " set position of item \"Read Me.rtf\" to {410, 200}" \
- -e " set the bounds of the container window to {50, 100, 590, 500}" \
- -e " update without registering applications" \
- -e " delay 5 -- Sync" \
- -e " close" \
- -e " end tell" \
- -e " -- Sync" \
- -e " delay 5" \
- -e "end tell" || true # Make sure we don't make the build bots fail
# Unmount the image now
hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
mkdir -p "$(top_builddir)/macosx-plugin-instdata"
cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
- /Developer/Tools/packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
+ PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
-f "$(top_builddir)/macosx-plugin-instdata" \
-i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
-d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
echo "" ; \
echo "# main sources" ; \
find include src -name '*.[chm]' -o -name '*.[ch]pp' \
- | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\)' \
+ | grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
| sort ; \
echo "" ; \
echo "# modules" ; \
- find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
+ find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
- | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+ | grep -vE 'qt4/ui/.*.h' \
+ | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
+ | grep -v 'gui/opie' \
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
projects / vlc / blobdiff