mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-24 18:33:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
b0152eca13
vlc/Makefile.am

1108 lines
47 KiB
Makefile
Raw Normal View History

* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
###############################################################################
# Automake targets and declarations
###############################################################################
* ALL: started the slow move to automake. For the moment, the changes are unnoticeable apart from the extra dependency on autoconf, automake and gettextize. See the new HACKING file for some information, especially if you don't run Linux. The current strategy is to have the configure script generate a nice automake Makefile from Makefile.am, and then clobber it with our good old dirty Makefile. Muahaha :-)
2002-08-26 07:18:05 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
# 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.
- Remove unneeded "." kludge (libvlc is now built from src) - Remove old NULL kludge
2007-05-20 01:47:15 +08:00
# - intl (gettext) is needed by src and modules
# - src (libvlc) is nedeed by modules, mozilla and bindings
# - libs/* are needed by modules
SUBDIRS = intl po libs/loader libs/srtp src modules \
- Improve DIST_SUBDIR - Require automake 1.9 to fix some libtool plugin build problems - Remove useless libs/Makefile
2007-03-11 19:04:38 +08:00
mozilla bindings activex share doc
DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
* ALL: started the slow move to automake. For the moment, the changes are unnoticeable apart from the extra dependency on autoconf, automake and gettextize. See the new HACKING file for some information, especially if you don't run Linux. The current strategy is to have the configure script generate a nice automake Makefile from Makefile.am, and then clobber it with our good old dirty Makefile. Muahaha :-)
2002-08-26 07:18:05 +08:00
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 07:32:00 +08:00
EXTRA_DIST = \
HACKING \
INSTALL.win32 \
Add Install.wince in the tar
2005-10-01 19:15:36 +08:00
INSTALL.wince \
Makefile.am: added vlc.exe.manifest to the distribution (should perhaps be moved to share/ after the svn switch) share/Makefile.am: added some wince-related resource files to the distribution
2004-03-04 01:18:38 +08:00
vlc.exe.manifest \
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 07:32:00 +08:00
MAINTAINERS \
README.MacOSX.rtf \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 21:50:13 +08:00
vlc-config.in.in \
Hrm
2006-10-28 05:22:10 +08:00
vlc.fedora.spec \
spec files have been renamed
2006-10-28 05:03:53 +08:00
vlc.mandriva.spec \
vlc.altlinux.spec \
- Remove unneeded "." kludge (libvlc is now built from src) - Remove old NULL kludge
2007-05-20 01:47:15 +08:00
vlc.win32.nsi.in
* ./Makefile.am: we don't distribute ./mkinstalldirs, it's in ./autotools/. * ./Makefile.am: we distribute ./toolbox.
2003-03-26 07:32:00 +08:00
Make scripts as such
2007-08-15 23:45:12 +08:00
dist_noinst_SCRIPTS = bootstrap toolbox
Makefile.am: Fix for introduction of vlc.win32.nsi.in
2006-04-13 05:56:41 +08:00
BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
if HAVE_DARWIN
- Build libvlc from src/ rather than top so that it is cleanly built before all modules (step toward buildable shared libvlc on Win32) - Don't build position dependant code when building shared libvlc (that was a big waste of time) - Link builtin modules with vlc rather than libvlc
2006-02-19 21:11:21 +08:00
BUILT_SOURCES_clean = macosx-sdk
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
else
BUILT_SOURCES_clean =
endif
Clean up
2005-08-20 00:06:54 +08:00
Work-around automake being a bit too clever
2005-08-23 03:00:19 +08:00
BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
Fix build in a subdirectory after make clean
2005-08-22 21:09:25 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
SUFFIXES =
Fix ./configure within make distcheck
2005-12-06 20:34:02 +08:00
DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
Don't build obsolete+broken wxwidgets in distcheck
2006-10-21 22:04:02 +08:00
--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
Fix ./configure within make distcheck
2005-12-06 20:34:02 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
# Tell aclocal to use -I m4. Wonder if it really works.
ACLOCAL_AMFLAGS = -I m4
###############################################################################
# MacOS X project
###############################################################################
EXTRA_DIST += \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
* finally converted to the 10.2 and later format, which is faster readable
2005-07-13 04:06:23 +08:00
extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
* Add the new Nibs to MAKE_DIST
2005-01-21 21:41:52 +08:00
extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
* small fix to the handling of the new nib-files (we are using the >= 10.2 format for the new ones, so 'objects.nib' is called 'keyedobjects.nib')
2005-01-21 22:57:23 +08:00
extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
* Add the new Nibs to MAKE_DIST
2005-01-21 21:41:52 +08:00
extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \
* small fix to the handling of the new nib-files (we are using the >= 10.2 format for the new ones, so 'objects.nib' is called 'keyedobjects.nib')
2005-01-21 22:57:23 +08:00
extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \
* Add the new Nibs to MAKE_DIST
2005-01-21 21:41:52 +08:00
extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \
* small fix to the handling of the new nib-files (we are using the >= 10.2 format for the new ones, so 'objects.nib' is called 'keyedobjects.nib')
2005-01-21 22:57:23 +08:00
extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
* ALL: basic skeleton for a streaming-wizard (refs #13) done: - all items are included with complete l10n support - checkboxes and select-file-buttons behave as they are supposed to todo: - implementation of the logic, i.e. handling of the collected values, respective manipulation of the GUI, start of the stream - move some arrays to an external header file - some GUI things (e.g. radio buttons on page 2, etc. - see FIXMEs) - implementation of some help-dialogues (it might be necessary to create a re-usable window in the nib for that, since NSAlert is Panther and Tiger only) - l10n string fixes (both in OSX and WX) => most of the work still needs to be done
2005-06-20 03:37:42 +08:00
extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
* Makefile.am: distribute the Makefile and zsh.cpp files in extras/.
2005-08-10 22:19:59 +08:00
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
* ALL: ported the WX-bookmarks-window to Cocoa (closes #22) - complete functionality except "Extract" (I'm going to fix that next week) * MainMenu.nib: re-orded the window-menu a bit * wizard.*: added a method to launch it from the bookmarks
2005-08-08 01:54:45 +08:00
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
* port of the wx-update-panel to OSX (GUI works, updating itself is not yet implemented, refs #310)
2005-08-22 01:45:05 +08:00
extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
* ALL: first development version of a GUI for the SubPicture Filters (refs #350) - the marquee section is already completely usable, more to come - TODO: - fix all FIXMEs - implement the logo and time settings completely - implement l10n - fix 10.3 compatibility (runs under Tiger only atm) - save the preferences, if requested - close a current vout and re-open it, when a filter is (de-)activated - redesign the GUI to a smaller panel
2005-12-03 21:36:54 +08:00
extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \
extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
* new CheckForUpdate panel (closes #310) - the actual download is currently done by your default browser since the needed notification window isn't available on OSX yet - download through VLC is implemented, but commented for the moment - needs some checking once a complete Status.xml is available
2006-02-19 02:40:04 +08:00
extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
* added the progress dialogue to the set of widgets - the Cancel-button is currently disabled because the core doesn't respond correctly (might be my fault though) - note that the File's Owner of the nib-file is of type VLCInteraction because the class can't resolve its outlets otherwise * WIDGET_TEXT and WIDGET_INPUT_TEXT are still missing, but will come in the next couple of days As usual, comments on the implementation and the GUI-design are welcome :)
2006-02-20 06:38:07 +08:00
extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
* additional interaction enhancements - intf_UserFatal takes an addition bool-argument now to set whether the error message will be blocking in the interface or not (so TRUE = blocking) - intf_UserWarn is always non-blocking and is used to check important, localised warnings to the user * wx: a compilation fix, but no update to the current API * osx: complete implementation of the interaction framework using some Carbon (!) functions, because the needed icons aren't accessible through Cocoa. Regrettably, I had to add yet another nib-file to keep the code clean and readable. The Error-dialogue is no longer re-usable (so the specific ID was removed). The interface needs to keep track of the reported errors and warnings. Thus, it may discard them as requested by the user and doesn't need to care about the core.
2006-07-31 06:00:44 +08:00
extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 08:46:23 +08:00
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 \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/divx.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 08:46:23 +08:00
extras/MacOSX/Resources/dv.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/generic.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 08:46:23 +08:00
extras/MacOSX/Resources/m3u.icns \
extras/MacOSX/Resources/mov.icns \
extras/MacOSX/Resources/mp3.icns \
extras/MacOSX/Resources/mp4.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/mpeg.icns \
extras/MacOSX/Resources/mpeg1.icns \
extras/MacOSX/Resources/mpeg2.icns \
extras/MacOSX/Resources/mpeg4.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 08:46:23 +08:00
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 \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/vlc.icns \
* added vlc.ebuild, vlc.spec.redhat to dist. * added all the new icons to the dist. * on make dist i would like to do mv vlc.ebuild vlc-${VERSION}.ebuild I don't know how to do this. Who does?
2003-05-15 08:46:23 +08:00
extras/MacOSX/Resources/vob.icns \
extras/MacOSX/Resources/wma.icns \
extras/MacOSX/Resources/wmv.icns \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/pause.png \
* THANKS: hungarian translator and designer of OSX intf controller added * modules/LIST: updated * Makefile.am: include new OS X art in the dist. * NEWS: updated * */.cvsignore: added and improved some of these. * modules/gui/macosx/prefs_widgets.?: - new config controls much like in the wxwindows module. not yet in use. - beware not tested irl. but it compiles :)
2003-11-17 14:31:22 +08:00
extras/MacOSX/Resources/pause_blue.png \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/play.png \
* THANKS: hungarian translator and designer of OSX intf controller added * modules/LIST: updated * Makefile.am: include new OS X art in the dist. * NEWS: updated * */.cvsignore: added and improved some of these. * modules/gui/macosx/prefs_widgets.?: - new config controls much like in the wxwindows module. not yet in use. - beware not tested irl. but it compiles :)
2003-11-17 14:31:22 +08:00
extras/MacOSX/Resources/play_blue.png \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
extras/MacOSX/Resources/stop.png \
* THANKS: hungarian translator and designer of OSX intf controller added * modules/LIST: updated * Makefile.am: include new OS X art in the dist. * NEWS: updated * */.cvsignore: added and improved some of these. * modules/gui/macosx/prefs_widgets.?: - new config controls much like in the wxwindows module. not yet in use. - beware not tested irl. but it compiles :)
2003-11-17 14:31:22 +08:00
extras/MacOSX/Resources/stop_blue.png \
extras/MacOSX/Resources/display.png \
extras/MacOSX/Resources/display_slider.png \
extras/MacOSX/Resources/display_track.png \
All: equalizer window for MacOS. Need a bit of corrections for the presets part. Reviews welcome
2004-08-08 05:56:42 +08:00
extras/MacOSX/Resources/equalizerdrawer_active.png \
extras/MacOSX/Resources/equalizerdrawer_blue.png \
* THANKS: hungarian translator and designer of OSX intf controller added * modules/LIST: updated * Makefile.am: include new OS X art in the dist. * NEWS: updated * */.cvsignore: added and improved some of these. * modules/gui/macosx/prefs_widgets.?: - new config controls much like in the wxwindows module. not yet in use. - beware not tested irl. but it compiles :)
2003-11-17 14:31:22 +08:00
extras/MacOSX/Resources/fullscreen_active.png \
extras/MacOSX/Resources/fullscreen_blue.png \
extras/MacOSX/Resources/next_active.png \
extras/MacOSX/Resources/next_blue.png \
extras/MacOSX/Resources/playlistdrawer_active.png \
extras/MacOSX/Resources/playlistdrawer_blue.png \
extras/MacOSX/Resources/previous_active.png \
extras/MacOSX/Resources/previous_blue.png \
extras/MacOSX/Resources/skip_forward_active.png \
extras/MacOSX/Resources/skip_forward_blue.png \
extras/MacOSX/Resources/skip_previous_active.png \
extras/MacOSX/Resources/skip_previous_blue.png \
extras/MacOSX/Resources/volume_high.png \
extras/MacOSX/Resources/volume_low.png \
extras/MacOSX/Resources/volumeslider_blue.png \
extras/MacOSX/Resources/volumeslider_normal.png \
extras/MacOSX/Resources/volumetrack.png \
* All : added an about VLC panel. It scrolls the names and the work of the AUTHORS file. * AUTHORS: updated my own info
2003-04-10 04:53:28 +08:00
extras/MacOSX/Resources/about_bg.png \
* fix make dist for OSX
2006-03-12 07:29:09 +08:00
extras/MacOSX/Resources/skip_forward_active_embedded.png \
extras/MacOSX/Resources/play_embedded.png \
extras/MacOSX/Resources/pause_embedded.png \
extras/MacOSX/Resources/skip_previous_active_embedded.png \
extras/MacOSX/Resources/pause_embedded_blue.png \
extras/MacOSX/Resources/play_embedded_blue.png \
extras/MacOSX/Resources/skip_forward_embedded_blue.png \
extras/MacOSX/Resources/skip_previous_embedded_blue.png \
* moved macosx-dmg to extras/MacOSX/macosx-dmg * added some macosx files to DIST that were probably missing in the tar ;)
2003-03-25 03:58:42 +08:00
extras/MacOSX/Resources/vlc.scriptSuite \
* updated the location of vlc.scriptTerminology * removed the linkage to it in all localisations since it is a global entity now
2005-03-28 18:32:40 +08:00
extras/MacOSX/Resources/vlc.scriptTerminology \
* Updated French and German translations courtesy of their maintainers * THANKS: added Jean-Pierre Kuypers, French translator * NEWS: updated for 0.5.3 release. Please check.
2003-04-06 23:43:02 +08:00
extras/MacOSX/Resources/README \
* add the new icons by Simon Damkjaer Anderson <simondamkjaer@gmail.com>, so Trax doesn't need to bootstrap over and over again. Implementation follows later on
2006-09-18 04:19:53 +08:00
extras/MacOSX/Resources/add_embedded.png \
extras/MacOSX/Resources/add_embedded_blue.png \
extras/MacOSX/Resources/repeat_embedded.png \
extras/MacOSX/Resources/repeat_embedded_blue.png \
extras/MacOSX/Resources/repeat_single_embedded_blue.png \
extras/MacOSX/Resources/shuffle_embedded.png \
extras/MacOSX/Resources/shuffle_embedded_blue.png \
* added the fspanel-related files to the respective targets
2006-10-13 00:33:35 +08:00
extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
extras/MacOSX/Resources/fs_volume_slider_knob.png \
extras/MacOSX/Resources/fs_volume_slider_bar.png \
extras/MacOSX/Resources/fs_volume_mute_highlight.png \
extras/MacOSX/Resources/fs_volume_mute.png \
extras/MacOSX/Resources/fs_volume_max_highlight.png \
extras/MacOSX/Resources/fs_volume_max.png \
extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
extras/MacOSX/Resources/fs_time_slider_knob.png \
extras/MacOSX/Resources/fs_time_slider.png \
extras/MacOSX/Resources/fs_stop_highlight.png \
extras/MacOSX/Resources/fs_stop.png \
extras/MacOSX/Resources/fs_skip_previous_highlight.png \
extras/MacOSX/Resources/fs_skip_previous.png \
extras/MacOSX/Resources/fs_skip_next_highlight.png \
extras/MacOSX/Resources/fs_skip_next.png \
extras/MacOSX/Resources/fs_rewind_highlight.png \
extras/MacOSX/Resources/fs_rewind.png \
extras/MacOSX/Resources/fs_play_highlight.png \
extras/MacOSX/Resources/fs_play.png \
extras/MacOSX/Resources/fs_pause_highlight.png \
extras/MacOSX/Resources/fs_pause.png \
extras/MacOSX/Resources/fs_forward_highlight.png \
extras/MacOSX/Resources/fs_forward.png \
extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
extras/MacOSX/Resources/fs_exit_fullscreen.png \
extras/MacOSX/Resources/fs_background.png \
* forward-port [17536]
2006-11-08 04:38:53 +08:00
extras/MacOSX/fullscreen_panel.svg \
* give credit to Jean-Baptiste le Stang for the UB script, add it to the source bundle and update authors a bit
2007-01-15 00:25:41 +08:00
extras/MacOSX/ub.sh \
Xcode project has moved
2007-02-06 23:09:54 +08:00
extras/MacOSX/vlc.xcodeproj/project.pbxproj \
* fixed the compilation on OSX when using our source-code-package and no svn checkout
2005-12-01 23:02:02 +08:00
extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
Fix make dist Case matters when using filenames!
2005-12-04 20:43:10 +08:00
extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
* fixed the compilation on OSX when using our source-code-package and no svn checkout
2005-12-01 23:02:02 +08:00
extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
Makefile.am: fixed EXTRA_DIST for MacOS X plugin
2006-05-02 17:23:06 +08:00
extras/MacOSX/plugin/Info.plist \
extras/MacOSX/plugin/InstallerInfo.plist \
extras/MacOSX/plugin/InstallerDescription.plist \
extras/MacOSX/plugin/pbdevelopment.plist \
- Remove unneeded "." kludge (libvlc is now built from src) - Remove old NULL kludge
2007-05-20 01:47:15 +08:00
extras/MacOSX/plugin/English.lproj/InfoPlist.strings
Makefile.am: Add the syntax files, valgrinds false positive suppressions, make nicificator to the tarball
2006-03-10 22:03:58 +08:00
###############################################################################
Add dbus-vlc.py to dist
2006-11-20 18:34:33 +08:00
# Various utilities ( editor syntax files, D-Bus controller ... )
Makefile.am: Add the syntax files, valgrinds false positive suppressions, make nicificator to the tarball
2006-03-10 22:03:58 +08:00
##############################################################################
EXTRA_DIST += \
* Makefile.am: distribute the Makefile and zsh.cpp files in extras/.
2005-08-10 22:19:59 +08:00
extras/Makefile \
extras/zsh.cpp \
Makefile.am: Add the syntax files, valgrinds false positive suppressions, make nicificator to the tarball
2006-03-10 22:03:58 +08:00
extras/emacs.init \
extras/vlc.vim \
extras/make.pl \
extras/valgrind.suppressions \
Re-use the old OBJC workaround and distribute autoconf260.m4
2006-09-16 00:20:57 +08:00
extras/m4/autoconf260.m4 \
s/vlc-debus/mpris/
2007-08-27 20:27:23 +08:00
extras/mpris.py \
extras/mpris.glade
* ./Makefile.am: added a "update-vlc.dsp" rule to create the MSVC project file from the makefile. * ./msvc/*: moved the MSVC files here. * ./src/extras/*: moved the extra code here (used to be in src/misc, extras/GNUgetopt and extras/Win32_msvc). * ./include/*: a few warning fixes.
2002-11-10 00:34:53 +08:00
* Makefile.am: added a dist-hook target to include the auto-generated msvc files into the dist. added src/misc/modules_plugins.h to the dist.
2003-04-25 00:13:38 +08:00
dist-hook:
Fix make dist when builddir != srcdir
2005-08-13 22:15:09 +08:00
distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
* Makefile.am: added a dist-hook target to include the auto-generated msvc files into the dist. added src/misc/modules_plugins.h to the dist.
2003-04-25 00:13:38 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
###############################################################################
# Building libvlc
###############################################################################
bin_SCRIPTS = vlc-config
- Fix building of vlc-config VLC can now be built in a subdirectory
2005-02-07 00:02:24 +08:00
vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
Clean up backported from [12323]
2006-02-19 17:52:55 +08:00
$(SHELL) ./config.status --file=$@
chmod 0755 $@
Make config.status happy (muahaha)
2006-06-05 02:43:05 +08:00
touch $@
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
Speed up recursive make significantly
2005-08-13 03:17:33 +08:00
vlc-config.in: vlc-config.in.in
./config.status --recheck
Make config.status happy (muahaha)
2006-06-05 02:43:05 +08:00
touch $@
Speed up recursive make significantly
2005-08-13 03:17:33 +08:00
Work-around automake being a bit too clever
2005-08-23 03:00:19 +08:00
CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
fix DISTCLEANFILES
2005-12-07 02:41:14 +08:00
DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
- build vlc_symbol.h modules_plugin.h and modules_builtin.h in top_builddir
2005-03-02 05:24:25 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
###############################################################################
# Building vlc
###############################################################################
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 21:50:13 +08:00
bin_PROGRAMS = vlc
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
Same as previous commit - for VLC
2006-03-11 01:30:32 +08:00
vlc_SOURCES = src/vlc.c
- Build libvlc from src/ rather than top so that it is cleanly built before all modules (step toward buildable shared libvlc on Win32) - Don't build position dependant code when building shared libvlc (that was a big waste of time) - Link builtin modules with vlc rather than libvlc
2006-02-19 21:11:21 +08:00
# Ugly kludge so that automake defines $(CXXLINK)
Fix path.
2006-12-07 05:27:32 +08:00
nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
Simplify and fix (real) vlc dependencies and "make core" assuming libtool is used
2007-10-01 03:28:30 +08:00
vlc_DEPENDENCIES = $(DATA_win32_rc)
* ./Makefile.am: another workaround for an old automake 1.5 bug (bug #279).
2002-10-02 21:26:14 +08:00
Separate LDFLAGS from LIBS for real. Should fix problems with building libvlc.so.1 when libvlc.so.0 is installed. Cannot test since the tree is currently broken.
2007-10-16 00:29:17 +08:00
vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc`
vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc`
*Partially* fix static builds
2007-08-16 01:15:56 +08:00
if !HAVE_PLUGINS
vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'`
endif
Test distcheck with libtool when using libtool so I can test
2006-03-11 02:10:45 +08:00
_Experimental_ *optional* libtool support (--enable-libtool) Should work fine (ie. better than --enable-shared-libvlc) on Linux, should work on Mac OS X (except for packaging), while shared libvlc doesn't. Won't work on Win32 with the current Win32 contrib. Stick to static libvlc or use --enable-shared-libvlc for now.
2006-02-24 03:41:36 +08:00
vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
Attempt to fix core and all targets with more than one job
2006-02-26 04:46:22 +08:00
LIB_libvlc = libvlc.la
LIBVLC = src/$(LIB_libvlc)
- Remove dependency of vlc on stamp-builtin with shared libvlc - Link against -lvlc instead of src/libvlc.so otherwise installed vlc cannot be loaded (closes #555) - Remove src/libvlc.a when src/libvlc.so is built so that previous item does not break Win32 linking <subliminal message>how about using libtool</subliminal message>
2006-02-21 02:00:28 +08:00
Add a nice target
2007-09-01 06:31:04 +08:00
#To get some nice output
nice:
Remove spurious tab
2007-09-19 06:20:10 +08:00
$(top_builddir)/compile
Add a nice target
2007-09-01 06:31:04 +08:00
Attempt to fix core and all targets with more than one job
2006-02-26 04:46:22 +08:00
# Shortcut for developpers to rebuild the core (libvlc + vlc)
# Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch
Fix core deps again
2006-11-05 23:46:26 +08:00
libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
Attempt to fix core and all targets with more than one job
2006-02-26 04:46:22 +08:00
Simplify and fix (real) vlc dependencies and "make core" assuming libtool is used
2007-10-01 03:28:30 +08:00
core: libvlc vlc$(EXEEXT)
Attempt to fix core and all targets with more than one job
2006-02-26 04:46:22 +08:00
Fix core deps again
2006-11-05 23:46:26 +08:00
.PHONY: libvlc core
vlc.exe: remove -lintl from dependencies (should be added to libvlc.la)
2007-07-30 16:55:05 +08:00
vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES)
- experimental disabled-by-default shared libvlc build. I said "experimental". I meant it. Developers might try --enable-shared-libvlc - remove autom4te*.cache on bootstrap (some customized autoconf add their version number) - some clean up
2005-08-20 20:30:12 +08:00
@rm -f vlc$(EXEEXT)
Fix linking with C++ builtins
2006-02-21 03:53:22 +08:00
@case `$(VLC_CONFIG) --linkage vlc builtin` in \
- experimental disabled-by-default shared libvlc build. I said "experimental". I meant it. Developers might try --enable-shared-libvlc - remove autom4te*.cache on bootstrap (some customized autoconf add their version number) - some clean up
2005-08-20 20:30:12 +08:00
c++) cmd="$(CXXLINK)" ;; \
objc) cmd="$(OBJCLINK)" ;; \
c|*) cmd="$(LINK)" ;; \
esac ; \
Continue fixing static builds
2007-08-16 01:37:20 +08:00
cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \
- experimental disabled-by-default shared libvlc build. I said "experimental". I meant it. Developers might try --enable-shared-libvlc - remove autom4te*.cache on bootstrap (some customized autoconf add their version number) - some clean up
2005-08-20 20:30:12 +08:00
echo $$cmd ; \
eval $$cmd
ALL: fixed i18n under BeOS
2003-04-18 23:25:51 +08:00
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
if HAVE_BEOS
Build vlc-bundle on BeOS
2006-02-21 19:02:38 +08:00
noinst_DATA = vlc-bundle
+ configure.ac: don't build OpenGL support on BeOS although it has gl.h + extras/contrib/src/*: build libmpeg2 w/o mmxext and 3dnow on BeOS (buggy compiler) + modules/gui/beos/*: quick compile fixes + modules/video_filter/deinterlace.c: require mmxext instead of mmx + Makefile.am: on BeOS, build a VLC bundle a la OS X
2004-07-23 06:59:50 +08:00
vlc-bundle: vlc
* Makefile.am: + Don't use vlc_app_DATA for the BeOS bundle. + Build the BeOS bundle in $(top_builddir).
2004-08-21 18:46:32 +08:00
rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
+ configure.ac: don't build OpenGL support on BeOS although it has gl.h + extras/contrib/src/*: build libmpeg2 w/o mmxext and 3dnow on BeOS (buggy compiler) + modules/gui/beos/*: quick compile fixes + modules/video_filter/deinterlace.c: require mmxext instead of mmx + Makefile.am: on BeOS, build a VLC bundle a la OS X
2004-07-23 06:59:50 +08:00
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
* Makefile.am: + Don't use vlc_app_DATA for the BeOS bundle. + Build the BeOS bundle in $(top_builddir).
2004-08-21 18:46:32 +08:00
mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
+ configure.ac: don't build OpenGL support on BeOS although it has gl.h + extras/contrib/src/*: build libmpeg2 w/o mmxext and 3dnow on BeOS (buggy compiler) + modules/gui/beos/*: quick compile fixes + modules/video_filter/deinterlace.c: require mmxext instead of mmx + Makefile.am: on BeOS, build a VLC bundle a la OS X
2004-07-23 06:59:50 +08:00
fi ; \
done
* Makefile.am: + Don't use vlc_app_DATA for the BeOS bundle. + Build the BeOS bundle in $(top_builddir).
2004-08-21 18:46:32 +08:00
if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
mkdir -p $(top_builddir)/vlc-bundle/lib ; \
for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
+ configure.ac: don't build OpenGL support on BeOS although it has gl.h + extras/contrib/src/*: build libmpeg2 w/o mmxext and 3dnow on BeOS (buggy compiler) + modules/gui/beos/*: quick compile fixes + modules/video_filter/deinterlace.c: require mmxext instead of mmx + Makefile.am: on BeOS, build a VLC bundle a la OS X
2004-07-23 06:59:50 +08:00
done ; \
fi
Use po/LINGUAS
2007-09-18 23:16:31 +08:00
cat $(top_srcdir)/po/LINGUAS | while read i; do \
* Makefile.am: + Don't use vlc_app_DATA for the BeOS bundle. + Build the BeOS bundle in $(top_builddir).
2004-08-21 18:46:32 +08:00
mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
cp "$(top_builddir)/po/$$i.gmo" \
"$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
ALL: fixed i18n under BeOS
2003-04-18 23:25:51 +08:00
done
* Makefile.am: + Don't use vlc_app_DATA for the BeOS bundle. + Build the BeOS bundle in $(top_builddir).
2004-08-21 18:46:32 +08:00
find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
endif
_Experimental_ *optional* libtool support (--enable-libtool) Should work fine (ie. better than --enable-shared-libvlc) on Linux, should work on Mac OS X (except for packaging), while shared libvlc doesn't. Won't work on Win32 with the current Win32 contrib. Stick to static libvlc or use --enable-shared-libvlc for now.
2006-02-24 03:41:36 +08:00
# Install the symlinks
* forwardport [17800] Before creating symlinks, make sure the actual binaries are installed. patch by Diego Petteno
2006-11-16 08:58:47 +08:00
install-exec-local: install-binPROGRAMS
Don't transform tavs to 4 spaces in Makefiles.
2006-12-23 23:12:01 +08:00
inst="`echo vlc | sed -e '$(transform)'`" ; \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-28 00:26:02 +08:00
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 21:50:13 +08:00
rm -f "$(DESTDIR)$(bindir)/$$i" && \
Take program-transform-name into account when creating vlc symlinks
2006-12-22 02:18:08 +08:00
ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
fi ; done
Deletes vlc's aliases upon make uninstall (refs #231)
2005-06-25 13:39:06 +08:00
# the opposite of install-{data,exec}-local
uninstall-local:
for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
rm -f "$(DESTDIR)$(bindir)/$$i" ; \
fi ; done
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
if HAVE_DARWIN
# Create the MacOS X app
ALL: - changed vlc.app into VLC.app modules/gui/macosx/vout.m: fixed a potential issue with the hiding of the mousecursor.
2003-02-11 23:35:29 +08:00
vlc_app_DATA = VLC.app
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
vlc_appdir = $(bindir)
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
# VLC-release.app is the old VLC.app target
VLC-release.app: vlc
@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-release.app
It's cp -R not cp -r
2005-11-14 04:32:26 +08:00
cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
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
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
Adds support for Apple's remote (only handles Play/Pause at the moment). AppleRemote.[mh] is MIT licensed code from Martin Kahr: http://www.martinkahr.com/source-code
2006-05-25 22:59:57 +08:00
AppleRemote.h \
AppleRemote.m \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
about.h \
about.m \
applescript.h \
applescript.m \
controls.h \
controls.m \
equalizer.h \
equalizer.m \
intf.h \
intf.m \
macosx.m \
misc.h \
misc.m \
open.h \
open.m \
output.h \
output.m \
playlist.h \
playlist.m \
playlistinfo.h \
playlistinfo.m \
prefs_widgets.h \
prefs_widgets.m \
prefs.h \
prefs.m \
vout.h \
voutqt.m \
voutgl.m \
* ALL: basic skeleton for a streaming-wizard (refs #13) done: - all items are included with complete l10n support - checkboxes and select-file-buttons behave as they are supposed to todo: - implementation of the logic, i.e. handling of the collected values, respective manipulation of the GUI, start of the stream - move some arrays to an external header file - some GUI things (e.g. radio buttons on page 2, etc. - see FIXMEs) - implementation of some help-dialogues (it might be necessary to create a re-usable window in the nib for that, since NSAlert is Panther and Tiger only) - l10n string fixes (both in OSX and WX) => most of the work still needs to be done
2005-06-20 03:37:42 +08:00
wizard.h \
wizard.m \
* port of the WX-advanded-GUI to OSX (refs #268) - the adjust-image-filter and the audio-filters are completely useable ToDo: - complete i18n support - video-filters - loading the settings from the prefs correctly - probably minor layout tweaks, etc.
2005-08-05 07:24:50 +08:00
extended.h \
extended.m \
Removing osd_widgets.c.
2005-08-25 23:02:30 +08:00
bookmarks.h \
bookmarks.m \
* ALL: first development version of a GUI for the SubPicture Filters (refs #350) - the marquee section is already completely usable, more to come - TODO: - fix all FIXMEs - implement the logo and time settings completely - implement l10n - fix 10.3 compatibility (runs under Tiger only atm) - save the preferences, if requested - close a current vout and re-open it, when a filter is (de-)activated - redesign the GUI to a smaller panel
2005-12-03 21:36:54 +08:00
sfilters.h \
sfilters.m \
* added a couple of OSX-intf-files which were added after the last release
2006-03-04 01:29:13 +08:00
update.h \
update.m \
interaction.h \
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
* added the fspanel-related files to the respective targets
2006-10-13 00:33:35 +08:00
fspanel.h \
fspanel.m \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
* simplified the xcodebuild part, since VLC doesn't support Darwin 6 aka OSX 10.2 anymore and we therefore don't need to support pbxbuild either
2006-12-31 22:27:10 +08:00
cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
* very first step to support future darwin releases
2006-12-29 03:36:57 +08:00
cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
* simplified the xcodebuild part, since VLC doesn't support Darwin 6 aka OSX 10.2 anymore and we therefore don't need to support pbxbuild either
2006-12-31 22:27:10 +08:00
$(top_builddir)/VLC-release.app; \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
Makefile.am: fix typos in the VLC-release.app target.
2007-07-27 04:35:35 +08:00
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib
Makefile.am: Make the VLC-release.app target libtool aware.
2007-07-22 07:04:43 +08:00
$(INSTALL) $(top_builddir)/.libs/vlc \
Makefile.am: fix typos in the VLC-release.app target.
2007-07-27 04:35:35 +08:00
$(top_builddir)/VLC-release.app/Contents/MacOS/VLC
Makefile.am: Make the VLC-release.app target libtool aware.
2007-07-22 07:04:43 +08:00
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
Makefile.am: fix typos in the VLC-release.app target.
2007-07-27 04:35:35 +08:00
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
* fixed [22708] for OSX
2007-10-20 23:14:12 +08:00
$(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
Bundle libvlc-control.dylib in VLC.app and VLC-release.app
2007-09-12 22:04:38 +08:00
$(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 \
$(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
Makefile.am: Make the VLC-release.app target libtool aware.
2007-07-22 07:04:43 +08:00
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
Makefile.am: With VLC-release.app make sure to install not to ln.
2007-07-22 18:45:49 +08:00
@executable_path/lib/libvlc.dylib \
Makefile.am: fix typos in the VLC-release.app target.
2007-07-27 04:35:35 +08:00
$(top_builddir)/VLC-release.app/Contents/MacOS/VLC
ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
Fix compilation on MacOS Thanks to pdherbemont
2007-07-28 01:16:56 +08:00
for i in `$(VLC_CONFIG) --target plugin` ; do \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
if test -n "$$i" ; \
Makefile.am: With VLC-release.app make sure to install not to ln.
2007-07-22 18:45:49 +08:00
then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
Makefile.am: fix typos in the VLC-release.app target.
2007-07-27 04:35:35 +08:00
"$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
fi ; done
* Makefile.am: MacOS X fix when srcdir != builddir.
2005-08-17 19:58:44 +08:00
if test -d $(srcdir)/extras/contrib/vlc-lib; then \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
* Makefile.am: MacOS X fix when srcdir != builddir.
2005-08-17 19:58:44 +08:00
for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
extras/contrib/src/Makefile: cleaned up INSTALL_NAME macro for MacOS X: all the dylib in contrib/lib are soft-linked to their distributed version in 'vlc-lib'. this way, VLC build system can use contrib libs on MacOS X the same way as for UNIX, and should simplify porting to libtool configure.ac: cleaned up Cocoa.h detection, removed link path dependency to 'vlc-lib' as it is no longer necessary Makefile.am: fixed installation of dylibs as vlc_ prefix is already appended by INSTALL_NAME NOTE: this change is highly disruptive for MacOS X build, I strongly recommend that you rebuild the contrib packages for this platform. Other platforms are unaffected
2006-03-06 07:49:52 +08:00
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
done ; \
fi
Mac OS X: Make sure luaplaylist folder is in the distribution.
2007-05-20 23:36:55 +08:00
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
done ; \
modules/meta_engine/luameta.c: Get meta (untested) and artwork using lua scripts.
2007-08-14 05:46:27 +08:00
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
for i in $(srcdir)/share/luameta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
done ; \
Add a new type of VLC Lua module: Interfaces. Two things led me to add this new type of Lua modules: * Most interfaces duplicate code from one another (rc and telnet both deal with sockets, rc and hotkeys duplicate VLC interfacing code) * It's easier to code in Lua than in C (for high level stuff) (* Users can code their own module easily, all they need is a text editor.) Most of the changes in modules/misc/ are Lua wrappers for different C APIs in VLC. I'd say that 90% of those wrappers won't change, the other 10% might need small changes (mostly to simplify the C code). The VLC Lua "interface" module will look for lua scripts in the *share*/luaintf/ directory. Files in *share*/luaintf/modules/ are lua modules which can be used by multiple VLC Lua modules (using require "modulename"). This commit includes 4 Lua interface modules: * dummy.lua: the default module. Prints error messages and quits. * rc.lua: equivalent to the legacy rc.c module. Also includes a bunch of new features (+ multiple socket connections at a time work!). See file for more details. * telnet.lua: equivalent to the legacy telnet.c module. See file for more details. * hotkeys.lua: a rewrite of the hotkey handling module. This module is still experimental. I'll need to change VLC core hotkeys stuff to make it work like I want (ie: 1 hotkey triggers 1 action instead of the current 1 action can have 1 hotkey). This version executes 3 dummy actions when keys 'q', 'w' or 'x' are pressed. What's left to do: * Port the http interface plugin to this framework (at least for the macros/rpn part ... using <?vlc some lua code ?> à la PHP would be way easier than what we currently have). * Finish work on the hotkeys module. * Code a real telnet/rc module with autocompletion and all the cool features usually found in a telnet/terminal interface. * Trash the legacy C modules. Stuff to test (which I can't test myself): * Win32 and Mac OS X specific changes to Makefile.am * Console interface under Win32. I expect it not to work. Other stuff included in this changeset are: * Code cleanup (I'm sure that it's still possible to simplify some of the old lua bindings code). * That's pretty much it in fact :/
2007-11-05 05:42:27 +08:00
$(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 ; \
Port the http interface to the Lua Interface Module framework. * share/luaintf/http.lua: Equivalent of the legacy modules/control/http/ module. (The new module takes 272 lines of Lua, instead of 5475 lines for the old one.) Functionality is basically the same except for CGI support which is missing. * share/http-lua/: The HTML files using the new <?vlc [lua code] ?> syntax. * modules/misc/lua/: Add Lua bindings for a few VLC function, the most important being the HTTPd high level functions, ACLs, stat and opendir. The Lua code still needs to be cleaned up a bit.
2007-11-11 00:34:53 +08:00
$(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
* fixed the copying of the re-worked http-interface to our release bundle. (not really clean, but I don't know how to do this in a better way...)
2006-03-20 22:13:04 +08:00
$(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
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests
for i in $(srcdir)/share/http/*.* ; do \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
done ; \
* fixed the copying of the re-worked http-interface to our release bundle. (not really clean, but I don't know how to do this in a better way...)
2006-03-20 22:13:04 +08:00
for i in $(srcdir)/share/http/dialogs/* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/js/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/old/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/old/admin/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/admin/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/old/vlm/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/vlm/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/images/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/images/`basename $${i}` ; \
done ; \
for i in $(srcdir)/share/http/requests/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/`basename $${i}` ; \
done ; \
* copy the http-intf-readme to the OSX-bundle as well
2006-03-23 02:09:55 +08:00
$(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
Use po/LINGUAS
2007-09-18 23:16:31 +08:00
cat $(top_srcdir)/po/LINGUAS | while read i; do \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
cp $(srcdir)/po/$${i}.gmo $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
mkdir -p $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/InfoPlist.strings \
$(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
ln -sf ../English.lproj/MainMenu.nib \
$(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \
done
printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo
* make sure that VLC-release.app includes permissions which allow it to run on restricted accounts. Credit Michael C. Haller <michael --at.- cilly com>. Additionally, don't create bogus links to the AppleScript library, which moved a while ago.
2007-06-27 02:59:05 +08:00
find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
* Makefile.am: + Forward AM_MAKEFLAGS through recursive makefiles. + Removed the plugins and builtins rules. This causes libintl to be built before the plugins. * bootstrap: + Enabled recursive builds of plugins and builtins. * vlc-config.in.in: + Fixed a typo. * debian/changelog: + Next upload will fix bug #199427.
2003-07-01 20:50:56 +08:00
VLC.app: vlc
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
@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
It's cp -R not cp -r
2005-11-14 04:32:26 +08:00
cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
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
mkdir -p $(top_builddir)/tmp/modules/gui/macosx
for i in \
Adds support for Apple's remote (only handles Play/Pause at the moment). AppleRemote.[mh] is MIT licensed code from Martin Kahr: http://www.martinkahr.com/source-code
2006-05-25 22:59:57 +08:00
AppleRemote.h \
AppleRemote.m \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
about.h \
about.m \
applescript.h \
applescript.m \
controls.h \
controls.m \
All: equalizer window for MacOS. Need a bit of corrections for the presets part. Reviews welcome
2004-08-08 05:56:42 +08:00
equalizer.h \
equalizer.m \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
intf.h \
intf.m \
macosx.m \
misc.h \
misc.m \
open.h \
open.m \
output.h \
output.m \
playlist.h \
playlist.m \
* Add missing playlistinfo files to OSX target
2004-04-30 02:32:58 +08:00
playlistinfo.h \
playlistinfo.m \
* added a package-translations target - holds doc/translations.txt - all the .po's - convert-po.sh
2004-02-06 05:01:44 +08:00
prefs_widgets.h \
prefs_widgets.m \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
prefs.h \
prefs.m \
vout.h \
* Added the new OSX vout files * added the new OSX vout files to pb proj.
2004-08-22 23:16:03 +08:00
voutqt.m \
voutgl.m \
* ALL: basic skeleton for a streaming-wizard (refs #13) done: - all items are included with complete l10n support - checkboxes and select-file-buttons behave as they are supposed to todo: - implementation of the logic, i.e. handling of the collected values, respective manipulation of the GUI, start of the stream - move some arrays to an external header file - some GUI things (e.g. radio buttons on page 2, etc. - see FIXMEs) - implementation of some help-dialogues (it might be necessary to create a re-usable window in the nib for that, since NSAlert is Panther and Tiger only) - l10n string fixes (both in OSX and WX) => most of the work still needs to be done
2005-06-20 03:37:42 +08:00
wizard.h \
wizard.m \
* port of the WX-advanded-GUI to OSX (refs #268) - the adjust-image-filter and the audio-filters are completely useable ToDo: - complete i18n support - video-filters - loading the settings from the prefs correctly - probably minor layout tweaks, etc.
2005-08-05 07:24:50 +08:00
extended.h \
extended.m \
Removing osd_widgets.c.
2005-08-25 23:02:30 +08:00
bookmarks.h \
bookmarks.m \
* ALL: first development version of a GUI for the SubPicture Filters (refs #350) - the marquee section is already completely usable, more to come - TODO: - fix all FIXMEs - implement the logo and time settings completely - implement l10n - fix 10.3 compatibility (runs under Tiger only atm) - save the preferences, if requested - close a current vout and re-open it, when a filter is (de-)activated - redesign the GUI to a smaller panel
2005-12-03 21:36:54 +08:00
sfilters.h \
sfilters.m \
* added a couple of OSX-intf-files which were added after the last release
2006-03-04 01:29:13 +08:00
update.h \
update.m \
interaction.h \
interaction.m \
embeddedwindow.h \
embeddedwindow.m \
* added the fspanel-related files to the respective targets
2006-10-13 00:33:35 +08:00
fspanel.h \
fspanel.m \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
vout.m; do \
cp "$(srcdir)/modules/gui/macosx/$$i" \
$(top_builddir)/tmp/modules/gui/macosx; \
done
* simplified the xcodebuild part, since VLC doesn't support Darwin 6 aka OSX 10.2 anymore and we therefore don't need to support pbxbuild either
2006-12-31 22:27:10 +08:00
cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
* very first step to support future darwin releases
2006-12-29 03:36:57 +08:00
cd ../../../ && \
cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
* simplified the xcodebuild part, since VLC doesn't support Darwin 6 aka OSX 10.2 anymore and we therefore don't need to support pbxbuild either
2006-12-31 22:27:10 +08:00
$(top_builddir)/VLC.app; \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
rm -Rf $(top_builddir)/tmp
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
Makefile.am: Use libtool on Mac OS X.
2007-07-22 04:10:21 +08:00
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/lib
$(INSTALL) $(top_builddir)/.libs/vlc \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
$(top_builddir)/VLC.app/Contents/MacOS/VLC
Makefile.am: Use libtool on Mac OS X.
2007-07-22 04:10:21 +08:00
$(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
* missed one occurence in the previous commit
2007-10-20 23:39:07 +08:00
$(INSTALL) $(top_builddir)/src/.libs/libvlc-control.1.dylib \
Don't mix VLC.app and VLC-release.app
2007-09-15 06:15:38 +08:00
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
Bundle libvlc-control.dylib in VLC.app and VLC-release.app
2007-09-12 22:04:38 +08:00
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
@executable_path/lib/libvlc.dylib \
Don't mix VLC.app and VLC-release.app
2007-09-15 06:15:38 +08:00
$(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
Makefile.am: Make the VLC-release.app target libtool aware.
2007-07-22 07:04:43 +08:00
install_name_tool -change /usr/local/lib/libvlc.1.dylib \
Makefile.am: With VLC-release.app make sure to install not to ln.
2007-07-22 18:45:49 +08:00
@executable_path/lib/libvlc.dylib \
$(top_builddir)/VLC.app/Contents/MacOS/VLC
* OSX lowlevel work - The VLCApplication is now launched at the vlc.c level instead of at the module level. Allows VLC to be a more valid Mac application, also removes the vout intf dependancy (use ncurses to disp. video :). This wasn't done at the libvlc level, because a mozilla plugin would no longer be able to function properly. - Some functionality of the macosx vout may not work without the OS X GUI, and not all of this is checked yet. - There is a symlink in VLC.app/Contents/Mac called clivlc that will force it back to a fullblown cli app when you want, so it can still be run by a user who isn't logged in via GUI. - there are some autorelease leaks which need to be tackled. - moved a lot of the VLCApplication func. to the VLCMain class. - VLCMain is a +sharedInstance now. - the complete OS X interface is still badly broken because of the many API changes lately. any volunteers? Examples: VLC.app/Contents/MacOS/VLC [-I macosx] launches VLC as before (requires you to be logged in via GUI) VLC.app/Contents/MacOS/VLC -I ncurses launch vlc with a ncurses intf and display video on your mac (requires you to be logged in via GUI) VLC.app/Contents/MacOS/clivlc -I telnet -d launch vlm remotely trough ssh in daemon mode, on a GUI'less server for instance, and stream your vids Now how is that for combining GUI and cli in one application on the mac?!!? :) jlj? I finally understand now how the OS X interface works !
2004-07-05 09:27:35 +08:00
ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
Fix compilation on MacOS Thanks to pdherbemont
2007-07-28 01:16:56 +08:00
for i in `$(VLC_CONFIG) --target plugin` ; do \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
if test -n "$$i" ; \
Fix compilation on MacOS Thanks to pdherbemont
2007-07-28 01:16:56 +08:00
then install_name_tool -change /usr/local/lib/libvlc.1.dylib \
Makefile.am: Run install_name_tool on the module.
2007-07-27 04:38:26 +08:00
@executable_path/lib/libvlc.dylib \
Fix compilation on MacOS Thanks to pdherbemont
2007-07-28 01:16:56 +08:00
"`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)"; \
ln -sfn "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
"$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
* bootstrap: + New build system, using recursive makefiles. Due to the amount of code in VLC, this had become unavoidable. + Removed the check for OS X's stack size, since our automake targets are a lot less hungry now. + Ditto for Solaris's sed. + Since automake-1.6 is faster than 1.7, use it first if both are present. * m4/vlc.m4: + New AX_ADD_CPPFLAGS, AX_ADD_CFLAGS, AX_ADD_CXXFLAGS, AX_ADD_OBJCFLAGS and AX_ADD_LDFLAGS macros that do all the magic to detect possible modules and register their flags. + New AX_ADD_BUILTINS and AX_ADD_PLUGINS macros. + Some magic to generate vlc-config. * configure.ac: + Moved most code to the AX_ADD_* macros. + Explicitely added all target Makefiles. * modules/**/Modules.am: + Path to sources are now relative to Modules.am's directory level.
2003-06-27 21:50:13 +08:00
fi ; done
* Makefile.am: MacOS X fix when srcdir != builddir.
2005-08-17 19:58:44 +08:00
if test -d $(srcdir)/extras/contrib/vlc-lib; then \
* Fixed bugs in the contrib build system. In particular 'make bin' should work now.
2003-11-23 21:06:43 +08:00
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/lib ; \
* Makefile.am: MacOS X fix when srcdir != builddir.
2005-08-17 19:58:44 +08:00
for i in $(srcdir)/extras/contrib/vlc-lib/*.dylib ; do \
Makefile.am: Use libtool on Mac OS X.
2007-07-22 04:10:21 +08:00
install_name_tool -change /usr/local/lib/libvlc.1.dylib @executable_path/lib/libvlc.dylib $${i}; \
extras/contrib/src/Makefile: cleaned up INSTALL_NAME macro for MacOS X: all the dylib in contrib/lib are soft-linked to their distributed version in 'vlc-lib'. this way, VLC build system can use contrib libs on MacOS X the same way as for UNIX, and should simplify porting to libtool configure.ac: cleaned up Cocoa.h detection, removed link path dependency to 'vlc-lib' as it is no longer necessary Makefile.am: fixed installation of dylibs as vlc_ prefix is already appended by INSTALL_NAME NOTE: this change is highly disruptive for MacOS X build, I strongly recommend that you rebuild the contrib packages for this platform. Other platforms are unaffected
2006-03-06 07:49:52 +08:00
ln -sfn `pwd`/$${i} $(top_builddir)/VLC.app/Contents/MacOS/lib/`basename $${i}` ; \
* Fixed bugs in the contrib build system. In particular 'make bin' should work now.
2003-11-23 21:06:43 +08:00
done ; \
* New build system for the contrib packages of VLC. It supports to download a precompiled binary package, or to build all the packages from the sources, at the user's option. It is currently written for Mac OS X, but could easily be ported to other platforms.
2003-11-15 09:21:48 +08:00
fi
Makefile.am: Correctly link share on Mac OS X.
2007-08-18 11:08:56 +08:00
ln -sfn `pwd`/$(srcdir)/share $(top_builddir)/VLC.app/Contents/MacOS/
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
Use po/LINGUAS
2007-09-18 23:16:31 +08:00
cat $(top_srcdir)/po/LINGUAS | while read i; do \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
Add a new target, VLC.app which make links to files instead of copies. The old VLC.app target has been renamed VLC-release.app
2005-04-06 22:36:57 +08:00
ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
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 ; \
* Italien translation, courtesy of Bruno <allevb@tin.it>, * Compilation fixes for gettext 0.11.5 on MacOS X.
2002-12-27 08:17:49 +08:00
done
* Makefile.am: . cleanups, use of top_builddir where possible, just to feel safer . fixed VLC.app inclusion of AUTHORS, COPYING etc. . propagated previous changes to package-osx . checked both build methods
2003-08-24 08:29:03 +08:00
printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
endif
if HAVE_WIN32
* ./bootstrap, ./Makefile.am: workarounds for automake 1.5.
2002-10-02 20:59:59 +08:00
DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA)
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
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
Makefile.am: pass version strings to windres share/vlc_win32_rc.rc: provide some version info in the vlc binary If all is well, this should not break msvc build, but binaries built with msvc will have version 0.0.0
2003-07-07 00:35:38 +08:00
$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir)/share -i $< -o $@
* ALL: the build mechanism now uses automake. See HACKING for more details. * ./mozilla/vlcplugin.cpp: javascript support for the Mozilla plugin. * debian/rules: the A52 module is now in a separate package.
2002-09-30 19:05:42 +08:00
endif
* forwardport [11880]
2005-07-28 07:43:35 +08:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
###############################################################################
# Building architecture-specific binary packages
###############################################################################
# XXX: this rule is probably only useful to you if you have exactly
Woody is past history
2007-09-01 06:16:19 +08:00
# the same setup as the maintaner(s).
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
#
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
package-win-common:
* vlc.win32.nsi: brand new NSIS auto-installer script. * Makefile.am: use vlc icon in the NSIS installer.
2004-05-15 01:07:50 +08:00
# Check that tmp isn't in the way
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
@if test -e "$(top_builddir)/vlc-${VERSION}"; then \
echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-28 00:26:02 +08:00
false; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
else \
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
fi
* vlc.win32.nsi: brand new NSIS auto-installer script. * Makefile.am: use vlc icon in the NSIS installer.
2004-05-15 01:07:50 +08:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Copy relevant files
Makefile.am: fix package-win32 to use libtool libs location
2007-07-31 05:10:22 +08:00
cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
Makefile.am: fix package-win32 to use libtool libs location
2007-07-31 05:10:22 +08:00
cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-${VERSION}/"
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-${VERSION}/"
* configure.ac, Makefile.am: Use upx for the win32 package if present. Fixed the mozilla plugin build on cygwin.
2004-04-28 21:01:14 +08:00
Don't replace @ on file without e-mail address
2007-11-10 06:07:51 +08:00
for file in AUTHORS MAINTAINERS THANKS ; \
Fix [23001]
2007-11-12 03:26:32 +08:00
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
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-27 03:39:43 +08:00
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
mkdir $(top_builddir)/vlc-${VERSION}/locale
Use po/LINGUAS
2007-09-18 23:16:31 +08:00
cat $(top_srcdir)/po/LINGUAS | while read i; do \
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-28 00:26:02 +08:00
cp "$(srcdir)/po/$${i}.gmo" \
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
"$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
|| true ; \
* configure.ac.in, Makefile.am, install-win32: fixed the package-win32 make target, and included the locales in the installer script. * src/libvlc.c: on win32 we look for the locales in vlc's directory.
2003-02-27 03:39:43 +08:00
done
Port the http interface to the Lua Interface Module framework. * share/luaintf/http.lua: Equivalent of the legacy modules/control/http/ module. (The new module takes 272 lines of Lua, instead of 5475 lines for the old one.) Functionality is basically the same except for CGI support which is missing. * share/http-lua/: The HTML files using the new <?vlc [lua code] ?> syntax. * modules/misc/lua/: Add Lua bindings for a few VLC function, the most important being the HTTPd high level functions, ACLs, stat and opendir. The Lua code still needs to be cleaned up a bit.
2007-11-11 00:34:53 +08:00
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/ ;
this should fix win32 and wince package-win*-base targets
2005-12-09 00:30:11 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
Fix the win* package rules for the http intf.
2006-01-23 02:13:59 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
Fixes for prehistoric build system
2006-01-28 19:38:49 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
this should fix win32 and wince package-win*-base targets
2005-12-09 00:30:11 +08:00
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
Distribute the .hosts and .access for win32
2007-03-03 08:16:52 +08:00
cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-${VERSION}/http/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/.hosts ;
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
Include http/*.png and http/*.ico in windows packages -- xtophe
2005-04-06 23:12:52 +08:00
unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
this should fix the win build. This build system is plain stupid. Why do we have references to the same stuff in http/Makefile.am and Makefile.am ?
2006-01-23 00:42:55 +08:00
cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
Fix the win* package rules for the http intf.
2006-01-23 02:13:59 +08:00
cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
Distribute the .hosts and .access for win32
2007-03-03 08:16:52 +08:00
cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/.hosts ;
Include http/*.png and http/*.ico in windows packages -- xtophe
2005-04-06 23:12:52 +08:00
cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
this should fix win32 and wince package-win*-base targets
2005-12-09 00:30:11 +08:00
cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
Add share/http/requests/readme to win target
2006-03-23 00:38:46 +08:00
cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/readme.txt ;
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
Fixes for prehistoric build system
2006-01-28 19:38:49 +08:00
cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
Distribute the .hosts and .access for win32
2007-03-03 08:16:52 +08:00
cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-${VERSION}/http/old/ ;
Fixes for prehistoric build system
2006-01-28 19:38:49 +08:00
cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
Distribute the .hosts and .access for win32
2007-03-03 08:16:52 +08:00
cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
Fixes for prehistoric build system
2006-01-28 19:38:49 +08:00
merge [13354] to trunk, and use the right .ico in the windows build
2005-11-24 04:53:56 +08:00
cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
* vlc.win32.nsi: brand new NSIS auto-installer script. * Makefile.am: use vlc icon in the NSIS installer.
2004-05-15 01:07:50 +08:00
* Makefile.am, install-win32: include the mozilla plugin in the win32 package. You'll still have to install the mozilla plugin manually though.
2003-10-21 05:48:46 +08:00
if BUILD_MOZILLA
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
* Makefile.am, install-win32: include the mozilla plugin in the win32 package. You'll still have to install the mozilla plugin manually though.
2003-10-21 05:48:46 +08:00
endif
* Makefile.am: include the activex plugin in package-win32-base.
2005-01-28 22:17:38 +08:00
if BUILD_ACTIVEX
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
Compile fix
2005-07-01 18:22:30 +08:00
cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-${VERSION}/activex/ ;
cp $(srcdir)/activex/test.html $(top_builddir)/vlc-${VERSION}/activex/ ;
* Makefile.am: include the activex plugin in package-win32-base.
2005-01-28 22:17:38 +08:00
unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
* Makefile.am: include the activex plugin in package-win32-base.
2005-01-28 22:17:38 +08:00
endif
- make use of cygwin rebase to optimize DLL loading, if present
2005-04-18 20:58:14 +08:00
# Rebase all those DLLs to speed up loading (need cygwin rebase)
* Makefile.am: "[ -x foo ]" only works if "foo" is in the current directory, there is no easy way to check for the presence of an executable, but trying to execute it ("foo --version >/dev/null") is usually safe.
2006-02-01 19:20:52 +08:00
if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
- make use of cygwin rebase to optimize DLL loading, if present
2005-04-18 20:58:14 +08:00
find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
fi
* Makefile.am: include the activex plugin in package-win32-base.
2005-01-28 22:17:38 +08:00
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
package-win-common-strip:
$(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
$(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
$(STRIP) "vlc-${VERSION}/libvlc-control$(LIBEXT)"
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
if BUILD_MOZILLA
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
$(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT);
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
endif
if BUILD_ACTIVEX
Makefile: fixed package-win32-zip, it was missing libvlc-controll.dll
2007-08-10 18:49:12 +08:00
$(STRIP) $(top_builddir)/vlc-${VERSION}/activex/axvlc$(LIBEXT);
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
endif
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
package-win32-base-debug: package-win-common
# Copy relevant files
Makefile.am: Fix for introduction of vlc.win32.nsi.in
2006-04-13 05:56:41 +08:00
cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
for i in "" `$(VLC_CONFIG) --target plugin` ; do \
if test -n "$$i" ; then \
Makefile.am: fix package-win32 to use libtool libs location
2007-07-31 05:10:22 +08:00
$(INSTALL) "$(top_builddir)/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
"$(top_builddir)/vlc-${VERSION}/plugins/" ; \
fi ; done
mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts
for i in $(srcdir)/share/skins2/fonts/*.*; do \
cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \
done
for i in $(srcdir)/share/skins2/*.*; do \
cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
done
fucking make
2007-08-14 03:28:35 +08:00
$(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luaplaylist
for i in $(srcdir)/share/luaplaylist/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luaplaylist/`basename $${i}` ; \
done ;
Distributes luameta on windows builds
2007-08-18 22:51:06 +08:00
$(INSTALL) -d $(top_builddir)/vlc-${VERSION}/share/luameta
for i in $(srcdir)/share/luameta/*.* ; do \
$(INSTALL) -m 644 $${i} $(top_builddir)/vlc-${VERSION}/share/luameta/`basename $${i}` ; \
done ;
Add a new type of VLC Lua module: Interfaces. Two things led me to add this new type of Lua modules: * Most interfaces duplicate code from one another (rc and telnet both deal with sockets, rc and hotkeys duplicate VLC interfacing code) * It's easier to code in Lua than in C (for high level stuff) (* Users can code their own module easily, all they need is a text editor.) Most of the changes in modules/misc/ are Lua wrappers for different C APIs in VLC. I'd say that 90% of those wrappers won't change, the other 10% might need small changes (mostly to simplify the C code). The VLC Lua "interface" module will look for lua scripts in the *share*/luaintf/ directory. Files in *share*/luaintf/modules/ are lua modules which can be used by multiple VLC Lua modules (using require "modulename"). This commit includes 4 Lua interface modules: * dummy.lua: the default module. Prints error messages and quits. * rc.lua: equivalent to the legacy rc.c module. Also includes a bunch of new features (+ multiple socket connections at a time work!). See file for more details. * telnet.lua: equivalent to the legacy telnet.c module. See file for more details. * hotkeys.lua: a rewrite of the hotkey handling module. This module is still experimental. I'll need to change VLC core hotkeys stuff to make it work like I want (ie: 1 hotkey triggers 1 action instead of the current 1 action can have 1 hotkey). This version executes 3 dummy actions when keys 'q', 'w' or 'x' are pressed. What's left to do: * Port the http interface plugin to this framework (at least for the macros/rpn part ... using <?vlc some lua code ?> à la PHP would be way easier than what we currently have). * Finish work on the hotkeys module. * Code a real telnet/rc module with autocompletion and all the cool features usually found in a telnet/terminal interface. * Trash the legacy C modules. Stuff to test (which I can't test myself): * Win32 and Mac OS X specific changes to Makefile.am * Console interface under Win32. I expect it not to work. Other stuff included in this changeset are: * Code cleanup (I'm sure that it's still possible to simplify some of the old lua bindings code). * That's pretty much it in fact :/
2007-11-05 05:42:27 +08:00
$(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 ;
Builds correctly lua for windows Distributes luaplaylist scripts with windows packages
2007-08-14 02:53:46 +08:00
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
osdmenu: Reverts [22062] which was a revert of [22061], and gives the .cfg the same name than the directory.
2007-09-16 06:54:41 +08:00
for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;do \
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
done; \
done
unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
Avoid using sed -i which seems to be non standard. Use makensis when it's installed in the default location. Patch by Hannes Domani
2007-09-18 07:36:25 +08:00
for file in $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg; do \
if sed 's%share/osdmenu%osdmenu%g' $$file >$$file.tmp; then :; else exit 1; fi; \
if sed 's%/%\\%g' $$file.tmp >$$file; then :; else exit 1; fi; \
rm -f $$file.tmp; \
done
Share most of binary packaging script between WinCE and Win32
2006-02-20 04:14:07 +08:00
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
package-win32-base: package-win32-base-debug package-win-common-strip
win32 rules: make it more dirty to be able to produce debug package
2006-01-29 02:43:13 +08:00
for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
Fix Win32 packaging targets inter-dependencies (otherwise unusable with more than one make job)
2006-02-25 06:39:45 +08:00
package-win32-base-exe: package-win32-base
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
# Create package
* Makefile.am: "[ -x foo ]" only works if "foo" is in the current directory, there is no easy way to check for the presence of an executable, but trying to execute it ("foo --version >/dev/null") is usually safe.
2006-02-01 19:20:52 +08:00
if makensis -VERSION >/dev/null 2>&1; then \
* Makefile.am: on Unix, use makensis -DVERSION; on Win32, use /DVERSION.
2006-02-01 22:57:12 +08:00
MAKENSIS="makensis -DVERSION=${VERSION}"; \
Makefile.am: target 'package-win32-base-exe' is now a bit smarter when looking for makensis, which also cover cygwin. Hence, target 'package-win32-base-exe-cygwin' is now redundant
2005-12-14 21:53:36 +08:00
elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
* Makefile.am: on Unix, use makensis -DVERSION; on Win32, use /DVERSION.
2006-02-01 22:57:12 +08:00
MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
Avoid using sed -i which seems to be non standard. Use makensis when it's installed in the default location. Patch by Hannes Domani
2007-09-18 07:36:25 +08:00
elif [ -x "${PROGRAMFILES}/NSIS/makensis" ]; then \
MAKENSIS="${PROGRAMFILES}/NSIS/makensis -DVERSION=${VERSION}"; \
typo
2007-10-13 00:25:08 +08:00
elif wine --version >/dev/null 2>&1; then \
* Makefile.am: on Unix, use makensis -DVERSION; on Win32, use /DVERSION.
2006-02-01 22:57:12 +08:00
MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
Makefile.am: target 'package-win32-base-exe' is now a bit smarter when looking for makensis, which also cover cygwin. Hence, target 'package-win32-base-exe-cygwin' is now redundant
2005-12-14 21:53:36 +08:00
else \
echo 'Error: cannot locate makensis tool'; exit 1; \
fi; \
* Makefile.am: on Unix, use makensis -DVERSION; on Win32, use /DVERSION.
2006-02-01 22:57:12 +08:00
eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
Makefile.am: target 'package-win32-base-exe' is now a bit smarter when looking for makensis, which also cover cygwin. Hence, target 'package-win32-base-exe-cygwin' is now redundant
2005-12-14 21:53:36 +08:00
package-win32-base-exe-cygwin: package-win32-base-exe
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
# Create package
* Makefile.am, install-win32: removed rle fonts from the win32 package and added the necessary files for the http interface.
2003-07-22 01:29:58 +08:00
Run makensis installer on Linux without wine to produce Windows installer package. NSIS 204 needs a patch for installation under Linux, it will be uploaded to contrib directory.
2005-02-08 22:33:40 +08:00
package-win32-base-exe-linux:
# Create package
makensis -DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
Fix Win32 packaging targets inter-dependencies (otherwise unusable with more than one make job)
2006-02-25 06:39:45 +08:00
package-win32-base-zip: package-win32-base
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Create package
Better compression for win32.zip packages building in order to make E-bola happy.
2006-10-17 03:59:34 +08:00
zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION}
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
Add 7zip win32 build targets
2006-03-22 04:56:35 +08:00
package-win32-base-7zip: package-win32-base
# Create package
7z a -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on vlc-${VERSION}-win32.7z vlc-${VERSION}
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
package-win32-exe: package-win32-base package-win32-base-exe
# Clean up
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
rm -Rf $(top_builddir)/vlc-${VERSION}
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
Run makensis installer on Linux without wine to produce Windows installer package. NSIS 204 needs a patch for installation under Linux, it will be uploaded to contrib directory.
2005-02-08 22:33:40 +08:00
package-win32-exe-linux: package-win32-base package-win32-base-exe-linux
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
Fix Win32 packaging targets inter-dependencies (otherwise unusable with more than one make job)
2006-02-25 06:39:45 +08:00
package-win32-zip: package-win32-base-zip
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
# Clean up
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
rm -Rf $(top_builddir)/vlc-${VERSION}
* Makefile.am: added a "package-win32-exe" and "package-win32-zip" rule. "package-win32" will do both.
2003-08-29 01:46:34 +08:00
Add 7zip win32 build targets
2006-03-22 04:56:35 +08:00
package-win32-7zip: package-win32-base-7zip
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
Makefile.am: tweack win32 packaging rules
2006-12-12 05:06:55 +08:00
package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip
package-win32: package-win32-no-clean
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Clean up
* Make VLC win32 package in build directory, not source directory * Added package-win32-base-exe-cygwin Makefile target, for Cygwin/msys users who don't need wine. (This should really be folded into the package-win32-base-exe target, but I'm not sure what the best way to detect a Cygwin/msys build environment is ...)
2004-12-28 22:11:36 +08:00
rm -Rf $(top_builddir)/vlc-${VERSION}
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
Hum ... we still want to strip when using wince
2006-03-28 23:40:43 +08:00
package-wince-base: package-win-common package-win-common-strip
Create some WinCE package target (Gibalou please review them)
2005-09-29 03:36:15 +08:00
package-wince-base-zip:
# Create package
zip -r vlc-${VERSION}-wince.zip vlc-${VERSION}
package-wince: package-wince-base package-wince-base-zip
# Clean up
rm -Rf $(top_builddir)/vlc-${VERSION}
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
package-beos:
# Check that tmp isn't in the way
* ./Makefile.am: used $(srcdir) where necessary (Closes: #319).
2003-05-24 20:35:06 +08:00
@if test -e $(srcdir)/tmp; then \
* Makefile.am: + Removed trailing / from directory names. + Used dummy instead of "" in the for/do/done loops. + Protected a couple of filenames with double quotes.
2003-06-28 00:26:02 +08:00
echo "Error: please remove $(srcdir)/tmp, it is in the way"; \
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
false ; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
else \
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
echo "OK." ; mkdir $(srcdir)/tmp ; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
fi
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-23 00:36:16 +08:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Copy relevant files
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
mkdir -p $(srcdir)/tmp/vlc ;
+ configure.ac: BeOS dvdread linkage fix + contrib/src/Makefile: build more libs on BeOS, use libdts' svn + Makefile.am: fixed BeOS packages generation
2004-07-23 22:19:31 +08:00
cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
THANKS NEWS tmp/vlc/ ;
# Create debug package
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
Some safety fix pointed by pjrm on irc
2006-11-05 23:51:46 +08:00
(cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+ configure.ac: BeOS dvdread linkage fix + contrib/src/Makefile: build more libs on BeOS, use libdts' svn + Makefile.am: fixed BeOS packages generation
2004-07-23 22:19:31 +08:00
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-23 00:36:16 +08:00
+ configure.ac: BeOS dvdread linkage fix + contrib/src/Makefile: build more libs on BeOS, use libdts' svn + Makefile.am: fixed BeOS packages generation
2004-07-23 22:19:31 +08:00
# Create normal package
configure.ac: added --disable/enable-hal Makefile.am: in package-beos, use $(STRIP) instead of strip since we might be cross-compiling
2005-02-19 09:58:57 +08:00
$(STRIP) --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
find $(srcdir)/tmp/vlc -name 'lib*.so' -exec $(STRIP) \
+ configure.ac: BeOS dvdread linkage fix + contrib/src/Makefile: build more libs on BeOS, use libdts' svn + Makefile.am: fixed BeOS packages generation
2004-07-23 22:19:31 +08:00
--strip-debug --strip-unneeded "{}" \; ;
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
Some safety fix pointed by pjrm on irc
2006-11-05 23:51:46 +08:00
(cd $(srcdir)/tmp && zip -9 -r vlc-${VERSION}-BeOS.zip vlc-${VERSION} )
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
mv $(srcdir)/tmp/vlc-${VERSION}-BeOS.zip $(srcdir)/ ;
* Makefile.am: fixed 'make package-beos' * modules/gui/beos/*: added _()s so the whole interface is translated * src/libvlc.c: ask gettext for UTF-8 strings (under BeOS only for now) FIXME: currently, untranslated strings are not converted to UTF-8
2003-04-23 00:36:16 +08:00
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Clean up
* Makefile.am: cleaned up package-beos * share/vlc_beos.rsrc: new icon based on Stephane's cone
2003-12-17 16:53:54 +08:00
rm -Rf $(srcdir)/tmp ;
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
package-macosx:
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
# Check that the temporary location isn't in the way
@if test -e "$(top_builddir)/vlc-${VERSION}/"; then \
rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
fi
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
echo "Create package directory: vlc-${VERSION}/";
mkdir -p "$(top_builddir)/vlc-${VERSION}/";
Makefile.am: Build and export the Framework in package-macosx. This is probably not an appropriate place and will change one day.
2007-11-06 01:18:17 +08:00
# 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
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Copy relevant files
Forward port of 17368. Make it easier to build a macosx package when build in debug mode.
2006-10-30 17:13:32 +08:00
@if test -e "$(top_builddir)/VLC-release.app/"; then \
cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
else \
cp -R "$(top_builddir)/VLC.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"; \
fi
Mac OS X package: When the dmg is opened force the open of the dmg window. Order the icon, and prepare the use of background image.
2007-04-04 00:46:15 +08:00
cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-${VERSION}/Goodies/ && \
mkdir -p $(top_builddir)/vlc-${VERSION}/.background/ && \
cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-${VERSION}/Goodies/ && \
cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/Goodies/Delete\ VLC\ Preferences.app && \
cp README.MacOSX.rtf $(top_builddir)/vlc-${VERSION}/Read\ Me.rtf && \
cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-${VERSION}/.background/background.png ;
# Place a link to the application folder
ln -s /Applications $(top_builddir)/vlc-${VERSION}/Applications ;
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Create disk image
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
echo "Creating disk image" ;
rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
Mac OS X package: When the dmg is opened force the open of the dmg window. Order the icon, and prepare the use of background image.
2007-04-04 00:46:15 +08:00
"$(top_builddir)/vlc-${VERSION}.dmg" -format UDRW \
* added 2 options for the OSX-disk-image creation-line - scrub: removes .Trashes - imagekey zlib-level=9: uses a better compression method, which saves us something MBs, but needs a bit more CPU-time. Thanks to cilly on IRC for suggesting this.
2006-03-31 01:38:36 +08:00
-scrub -imagekey zlib-level=9 ;
Mac OS X package: When the dmg is opened force the open of the dmg window. Order the icon, and prepare the use of background image.
2007-04-04 00:46:15 +08:00
# Make sure the root window of the dmg will pop up when the dmg is mounted.
# Note: We dont mount in /Volumes to be sure we won't collide with an other
# finder mounted dmg with the same name.
echo "Make sure the root window of the dmg will pop up when the dmg is mounted" ;
mkdir -p $(top_builddir)/vlcmnt ;
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
cd "$(srcdir)"
# Unmount the image now
hdiutil detach "$(top_builddir)/vlcmnt/vlc-${VERSION}" ;
rm -R $(top_builddir)/vlcmnt ;
# Make sure the image is not writable
# Note: We can't directly create a read only dmg as we do the bless stuff
echo "Make the disk image read-only" ;
mv "$(top_builddir)/vlc-${VERSION}.dmg" "$(top_builddir)/vlc-${VERSION}-rw.dmg" ;
hdiutil convert "$(top_builddir)/vlc-${VERSION}-rw.dmg" -format UDZO -o "$(top_builddir)/vlc-${VERSION}.dmg" ;
rm "$(top_builddir)/vlc-${VERSION}-rw.dmg" ;
# We are done
* be a bit more verbose when creating the disk-image
2006-04-13 00:54:42 +08:00
echo "Disk image creation completed:" ;
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
# Clean up
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
* Re-enabled package-* Makefile rules, * Worked around automake stack overflow bug on Darwin.
2002-12-26 05:02:35 +08:00
- added installer for MacOSX VLC Plugin - updated supported mime types in resource
2006-05-01 00:08:32 +08:00
package-macosx-plugin:
if BUILD_MOZILLA
- MacOS X: bundle 'VLC Internet Plug-In' package into a disk image for online distribution
2006-05-01 01:40:34 +08:00
# Create Installer
rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
- added installer for MacOSX VLC Plugin - updated supported mime types in resource
2006-05-01 00:08:32 +08:00
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"
- mozilla plugin: added support for XCode 3 tools (leopard)
2007-11-04 04:09:50 +08:00
PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
- added installer for MacOSX VLC Plugin - updated supported mime types in resource
2006-05-01 00:08:32 +08:00
-f "$(top_builddir)/macosx-plugin-instdata" \
-i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
-d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
rm -rf "$(top_builddir)/macosx-plugin-instdata/"
- MacOS X: bundle 'VLC Internet Plug-In' package into a disk image for online distribution
2006-05-01 01:40:34 +08:00
# Create disk image
rm -f "$(top_builddir)/vlc-plugin-${VERSION}.dmg"; true
rm -rf "$(top_builddir)/vlc-plugin-${VERSION}/"; true
mkdir -p "$(top_builddir)/vlc-plugin-${VERSION}/"
mv "$(top_builddir)/VLC Internet Plug-In.pkg" "$(top_builddir)/vlc-plugin-${VERSION}/"
hdiutil create -srcfolder "$(top_builddir)/vlc-plugin-${VERSION}" \
"$(top_builddir)/vlc-plugin-${VERSION}.dmg" -format UDZO \
-scrub -imagekey zlib-level=9 ;
echo "Disk image creation completed:"
rm -rf "$(top_builddir)/vlc-plugin-${VERSION}"
- added installer for MacOSX VLC Plugin - updated supported mime types in resource
2006-05-01 00:08:32 +08:00
endif
* added a package-translations target - holds doc/translations.txt - all the .po's - convert-po.sh
2004-02-06 05:01:44 +08:00
package-translations:
@if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \
false; \
else \
echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
fi
# Copy translations
Use po/LINGUAS
2007-09-18 23:16:31 +08:00
cat $(top_srcdir)/po/LINGUAS | while read i; do \
* added a package-translations target - holds doc/translations.txt - all the .po's - convert-po.sh
2004-02-06 05:01:44 +08:00
cp "$(srcdir)/po/$${i}.po" \
"$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
|| true ; \
done
cp "$(srcdir)/doc/translations.txt" \
"$(srcdir)/vlc-translations-${VERSION}/README.txt"
echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo 'if test $$# != 1; then' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo " echo \"Usage: convert-po.sh <.po file>\"" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo " exit 1" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo "fi" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
echo 'msgfmt --statistics -o vlc.mo $$1' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
$(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
| GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
###############################################################################
# PO translation files update
Fix make dist
2007-09-06 06:11:02 +08:00
# Generate po/POTFILES.in which lists all the files containing translatable
# strings. Find all source files and remove the generated files
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
###############################################################################
.PHONY: update-po
update-po:
rm -f $(top_srcdir)/po/POTFILES.in
{ \
Some safety fix pointed by pjrm on irc
2006-11-05 23:51:46 +08:00
cd $(top_srcdir) && \
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
echo "# automatically created by make update-po" ; \
echo "" ; \
echo "# main sources" ; \
find include src -name '*.[chm]' -o -name '*.[ch]pp' \
Don't put built sources in POTFILES.in
2007-11-08 08:07:58 +08:00
| grep -v '\(misc/modules_\|src/misc/revision.c\|modules/builtin.h\|include/vlc_about.h\)' \
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
| sort ; \
echo "" ; \
echo "# modules" ; \
* fix make update-po on platforms with a non-GNU find implementation, aka BSD / Darwin. Thanks to xtophe for pointing this out and helping me
2007-10-21 06:39:20 +08:00
find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name '*.ui' \
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
| grep -v '\(\.moc\.\|gui/gtk2/\)' \
Don't use modules/gui/opie in gettext as we don't distribute it. Upgrade POTFILE.in and vlc.pot
2007-11-15 06:02:01 +08:00
| grep -vE 'qt4/ui/.*.h' \
| grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
| grep -v 'gui/opie' \
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
| sort ; \
} > $(top_srcdir)/po/POTFILES.in
rm -f $(top_srcdir)/po/vlc.pot
* Modules.am: (Hopefully) fixed make update-po.
2005-08-22 22:22:41 +08:00
cd po && $(MAKE) POTFILES vlc.pot update-po
"toolbox --update-po" becomes "make update-po" Now can update PO when compiling from subdir
2005-08-13 21:14:19 +08:00
#cd po && $(MAKE) update-po
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 10:56:35 +08:00
###############################################################################
# Stamp rules
###############################################################################
*Partially* fix static builds
2007-08-16 01:15:56 +08:00
stamp-builtin:
@for dep in "" `$(VLC_CONFIG) --target plugin`; do \
if test "$${dep}.la" -nt "$(top_builddir)/vlc$(EXEEXT)"; then \
touch "$@"; \
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 10:56:35 +08:00
break; \
fi; \
done
*Partially* fix static builds
2007-08-16 01:15:56 +08:00
.PHONY: stamp-builtin
* Makefile.am: + If a builtin has been rebuilt, rebuild vlc. + Do not rebuild the Mozilla plugin's xpt when the Makefile changes.
2003-07-03 10:56:35 +08:00
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
###############################################################################
# Enforce Mac OS X deployment target environment variable
###############################################################################
Remove vlc_symbols - refs #297. Maintaining an API with this was pretty much impossible.
2007-07-29 16:26:56 +08:00
macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
* Simpler way to create the diskimage (10.3 and higher only) * realigning of some of the configure --help options * added --with-macosx-sdk - compiles VLC (not contrib) with the 10.3.9 SDK - uses a small hack to enforce the deployment target when you do make in the srcdir - requires you to use gcc 4.0 on on Mac OS X 10.4
2006-01-05 05:53:52 +08:00
export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
Reference in New Issue Copy Permalink