X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=88d5703b6bec0363add71f6054d36678fa87c5fb;hb=7179862ee5ec72a7d85a9ceb8ef818f609108704;hp=0fbdb921f55c7eece95236b1a9d1a713977d94b9;hpb=bcca390d4441aac7c53e60b457e17bb4af8f6f71;p=vlc diff --git a/Makefile.am b/Makefile.am index 0fbdb921f5..88d5703b6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,29 +5,28 @@ # 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. -# - 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 \ - mozilla bindings activex share doc -DIST_SUBDIRS = $(SUBDIRS) m4 ipkg +SUBDIRS = po libs/loader libs/srtp src modules \ + projects/mozilla bindings projects/activex share doc +DIST_SUBDIRS = $(SUBDIRS) m4 extras/package/ipkg EXTRA_DIST = \ HACKING \ INSTALL.win32 \ INSTALL.wince \ - vlc.exe.manifest \ + extras/package/win32/vlc.exe.manifest \ MAINTAINERS \ - README.MacOSX.rtf \ + extras/package/macosx/README.MacOSX.rtf \ vlc-config.in.in \ - vlc.fedora.spec \ - vlc.mandriva.spec \ - vlc.altlinux.spec \ - vlc.win32.nsi.in + extras/package/rpm/vlc.fedora.spec \ + extras/package/rpm/vlc.mandriva.spec \ + extras/package/rpm/vlc.altlinux.spec \ + extras/package/win32/vlc.win32.nsi.in dist_noinst_SCRIPTS = bootstrap toolbox -BUILT_SOURCES_distclean = vlc-config compile vlc.win32.nsi +BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi if HAVE_DARWIN BUILT_SOURCES_clean = macosx-sdk else @@ -46,181 +45,180 @@ AUTOMAKE_OPTIONS = \ 1.9 \ -Wall \ check-news \ - std-options \ dist-bzip2 \ no-dist-gzip +# std-options ############################################################################### # MacOS X project ############################################################################### EXTRA_DIST += \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ - 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 \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \ - extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ - 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 \ - 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 \ - 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 \ - 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 \ - 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 \ - extras/MacOSX/Resources/English.lproj/InfoPlist.strings \ - 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 \ - extras/MacOSX/Resources/divx.icns \ - extras/MacOSX/Resources/dv.icns \ - extras/MacOSX/Resources/generic.icns \ - extras/MacOSX/Resources/m3u.icns \ - extras/MacOSX/Resources/mov.icns \ - extras/MacOSX/Resources/mp3.icns \ - extras/MacOSX/Resources/mp4.icns \ - extras/MacOSX/Resources/mpeg.icns \ - extras/MacOSX/Resources/mpeg1.icns \ - extras/MacOSX/Resources/mpeg2.icns \ - extras/MacOSX/Resources/mpeg4.icns \ - 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 \ - extras/MacOSX/Resources/vlc.icns \ - extras/MacOSX/Resources/vob.icns \ - extras/MacOSX/Resources/wma.icns \ - extras/MacOSX/Resources/wmv.icns \ - extras/MacOSX/Resources/pause.png \ - extras/MacOSX/Resources/pause_blue.png \ - extras/MacOSX/Resources/play.png \ - extras/MacOSX/Resources/play_blue.png \ - extras/MacOSX/Resources/stop.png \ - extras/MacOSX/Resources/stop_blue.png \ - extras/MacOSX/Resources/display.png \ - extras/MacOSX/Resources/display_slider.png \ - extras/MacOSX/Resources/display_track.png \ - extras/MacOSX/Resources/equalizerdrawer_active.png \ - extras/MacOSX/Resources/equalizerdrawer_blue.png \ - 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 \ - extras/MacOSX/Resources/about_bg.png \ - 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 \ - extras/MacOSX/Resources/vlc.scriptSuite \ - extras/MacOSX/Resources/vlc.scriptTerminology \ - extras/MacOSX/Resources/README \ - 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 \ - 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 \ - extras/MacOSX/fullscreen_panel.svg \ - extras/MacOSX/ub.sh \ - extras/MacOSX/vlc.xcodeproj/project.pbxproj \ - extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ - extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ - 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 \ - extras/MacOSX/plugin/Info.plist \ - extras/MacOSX/plugin/InstallerInfo.plist \ - extras/MacOSX/plugin/InstallerDescription.plist \ - extras/MacOSX/plugin/pbdevelopment.plist \ - extras/MacOSX/plugin/English.lproj/InfoPlist.strings + extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \ + extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \ + extras/package/macosx/Resources/English.lproj/InfoPlist.strings \ + extras/package/macosx/Resources/a52.icns \ + extras/package/macosx/Resources/aac.icns \ + extras/package/macosx/Resources/asf.icns \ + extras/package/macosx/Resources/asx.icns \ + extras/package/macosx/Resources/avi.icns \ + extras/package/macosx/Resources/bin.icns \ + extras/package/macosx/Resources/cue.icns \ + extras/package/macosx/Resources/dat.icns \ + extras/package/macosx/Resources/divx.icns \ + extras/package/macosx/Resources/dv.icns \ + extras/package/macosx/Resources/generic.icns \ + extras/package/macosx/Resources/m3u.icns \ + extras/package/macosx/Resources/mov.icns \ + extras/package/macosx/Resources/mp3.icns \ + extras/package/macosx/Resources/mp4.icns \ + extras/package/macosx/Resources/mpeg.icns \ + extras/package/macosx/Resources/mpeg1.icns \ + extras/package/macosx/Resources/mpeg2.icns \ + extras/package/macosx/Resources/mpeg4.icns \ + extras/package/macosx/Resources/mpg.icns \ + extras/package/macosx/Resources/ogg.icns \ + extras/package/macosx/Resources/ogm.icns \ + extras/package/macosx/Resources/pls.icns \ + extras/package/macosx/Resources/srt.icns \ + extras/package/macosx/Resources/sub.icns \ + extras/package/macosx/Resources/vlc.icns \ + extras/package/macosx/Resources/vob.icns \ + extras/package/macosx/Resources/wma.icns \ + extras/package/macosx/Resources/wmv.icns \ + extras/package/macosx/Resources/pause.png \ + extras/package/macosx/Resources/pause_blue.png \ + extras/package/macosx/Resources/play.png \ + extras/package/macosx/Resources/play_blue.png \ + extras/package/macosx/Resources/stop.png \ + extras/package/macosx/Resources/stop_blue.png \ + extras/package/macosx/Resources/display.png \ + extras/package/macosx/Resources/display_slider.png \ + extras/package/macosx/Resources/display_track.png \ + extras/package/macosx/Resources/equalizerdrawer_active.png \ + extras/package/macosx/Resources/equalizerdrawer_blue.png \ + extras/package/macosx/Resources/fullscreen_active.png \ + extras/package/macosx/Resources/fullscreen_blue.png \ + extras/package/macosx/Resources/next_active.png \ + extras/package/macosx/Resources/next_blue.png \ + extras/package/macosx/Resources/playlistdrawer_active.png \ + extras/package/macosx/Resources/playlistdrawer_blue.png \ + extras/package/macosx/Resources/previous_active.png \ + extras/package/macosx/Resources/previous_blue.png \ + extras/package/macosx/Resources/skip_forward_active.png \ + extras/package/macosx/Resources/skip_forward_blue.png \ + extras/package/macosx/Resources/skip_previous_active.png \ + extras/package/macosx/Resources/skip_previous_blue.png \ + extras/package/macosx/Resources/volume_high.png \ + extras/package/macosx/Resources/volume_low.png \ + extras/package/macosx/Resources/volumeslider_blue.png \ + extras/package/macosx/Resources/volumeslider_normal.png \ + extras/package/macosx/Resources/volumetrack.png \ + extras/package/macosx/Resources/about_bg.png \ + extras/package/macosx/Resources/skip_forward_active_embedded.png \ + extras/package/macosx/Resources/play_embedded.png \ + extras/package/macosx/Resources/pause_embedded.png \ + extras/package/macosx/Resources/skip_previous_active_embedded.png \ + extras/package/macosx/Resources/pause_embedded_blue.png \ + extras/package/macosx/Resources/play_embedded_blue.png \ + extras/package/macosx/Resources/skip_forward_embedded_blue.png \ + extras/package/macosx/Resources/skip_previous_embedded_blue.png \ + extras/package/macosx/Resources/vlc.scriptSuite \ + extras/package/macosx/Resources/vlc.scriptTerminology \ + extras/package/macosx/Resources/README \ + extras/package/macosx/Resources/add_embedded.png \ + extras/package/macosx/Resources/add_embedded_blue.png \ + extras/package/macosx/Resources/repeat_embedded.png \ + extras/package/macosx/Resources/repeat_embedded_blue.png \ + extras/package/macosx/Resources/repeat_single_embedded_blue.png \ + extras/package/macosx/Resources/shuffle_embedded.png \ + extras/package/macosx/Resources/shuffle_embedded_blue.png \ + extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png \ + extras/package/macosx/Resources/fs_volume_slider_knob.png \ + extras/package/macosx/Resources/fs_volume_slider_bar.png \ + extras/package/macosx/Resources/fs_volume_mute_highlight.png \ + extras/package/macosx/Resources/fs_volume_mute.png \ + extras/package/macosx/Resources/fs_volume_max_highlight.png \ + extras/package/macosx/Resources/fs_volume_max.png \ + extras/package/macosx/Resources/fs_time_slider_knob_highlight.png \ + extras/package/macosx/Resources/fs_time_slider_knob.png \ + extras/package/macosx/Resources/fs_time_slider.png \ + extras/package/macosx/Resources/fs_stop_highlight.png \ + extras/package/macosx/Resources/fs_stop.png \ + extras/package/macosx/Resources/fs_skip_previous_highlight.png \ + extras/package/macosx/Resources/fs_skip_previous.png \ + extras/package/macosx/Resources/fs_skip_next_highlight.png \ + extras/package/macosx/Resources/fs_skip_next.png \ + extras/package/macosx/Resources/fs_rewind_highlight.png \ + extras/package/macosx/Resources/fs_rewind.png \ + extras/package/macosx/Resources/fs_play_highlight.png \ + extras/package/macosx/Resources/fs_play.png \ + extras/package/macosx/Resources/fs_pause_highlight.png \ + extras/package/macosx/Resources/fs_pause.png \ + extras/package/macosx/Resources/fs_forward_highlight.png \ + extras/package/macosx/Resources/fs_forward.png \ + extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \ + extras/package/macosx/Resources/fs_exit_fullscreen.png \ + extras/package/macosx/Resources/fs_background.png \ + extras/package/macosx/fullscreen_panel.svg \ + extras/package/macosx/ub.sh \ + extras/package/macosx/vlc.xcodeproj/project.pbxproj \ + extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \ + extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \ + extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \ + extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \ + extras/package/macosx/plugin/Info.plist \ + extras/package/macosx/plugin/InstallerInfo.plist \ + extras/package/macosx/plugin/InstallerDescription.plist \ + extras/package/macosx/plugin/pbdevelopment.plist \ + extras/package/macosx/plugin/English.lproj/InfoPlist.strings ############################################################################### # Various utilities ( editor syntax files, D-Bus controller ... ) ############################################################################## EXTRA_DIST += \ - extras/Makefile \ - extras/zsh.cpp \ - extras/emacs.init \ - extras/vlc.vim \ - extras/make.pl \ - extras/valgrind.suppressions \ - extras/m4/autoconf260.m4 \ - extras/mpris.py \ - extras/mpris.glade + extras/analyser/zsh_completion.sh \ + extras/analyser/zsh.cpp \ + extras/analyser/emacs.init \ + extras/analyser/vlc.vim \ + extras/analyser/valgrind.suppressions \ + extras/buildsystem/make.pl \ + extras/misc/mpris.py \ + extras/misc/mpris.glade dist-hook: distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib @@ -246,51 +244,17 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch libvlc: - cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc) + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la -.PHONY: libvlc +core: + cd src && $(MAKE) $(AM_MAKEFLAGS) vlc -############################################################################### -# Building vlc -############################################################################### - -bin_PROGRAMS = vlc - -vlc_SOURCES = src/vlc.c -# Ugly kludge so that automake defines $(CXXLINK) -nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m - -vlc_DEPENDENCIES = $(DATA_win32_rc) - -vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc` -vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` -if !HAVE_PLUGINS -vlc_LDFLAGS += `$(VLC_CONFIG) --target plugin | sed -e 's/\_plugin /_plugin.la /g'` -endif - -vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` -LIB_libvlc = libvlc.la -LIBVLC = src/$(LIB_libvlc) +.PHONY: libvlc core #To get some nice output nice: $(top_builddir)/compile -core: libvlc vlc$(EXEEXT) - -.PHONY: core - -vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) - @rm -f vlc$(EXEEXT) - @case `$(VLC_CONFIG) --linkage vlc builtin` in \ - c++) cmd="$(CXXLINK)" ;; \ - objc) cmd="$(OBJCLINK)" ;; \ - c|*) cmd="$(LINK)" ;; \ - esac ; \ - cmd="$$cmd $(vlc_OBJECTS) $(vlc_LDADD) $(vlc_LDFLAGS)" ; \ - echo $$cmd ; \ - eval $$cmd - if HAVE_BEOS noinst_DATA = vlc-bundle vlc-bundle: vlc @@ -323,7 +287,10 @@ endif ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc bin_SCRIPTS += $(ALIASES) +CLEANFILES += $(ALIASES) +if BUILD_VLC EXTRA_SCRIPTS = $(ALL_ALIASES) +endif dist_noinst_SCRIPTS += make-alias @@ -347,22 +314,34 @@ qvlc: make-alias nvlc: make-alias $(MKALIAS) ncurses +if BUILD_VLC +noinst_SCRIPTS = vlc$(EXEEXT) +endif + +vlc$(EXEEXT): core + rm -f vlc$(EXEEXT) + ln -s src/vlc$(EXEEXT) +# rm -f -- vlc vlc.tmp +# echo '#! /bin/sh' > vlc.tmp +# echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp +# chmod +x vlc.tmp +# mv -f -- vlc.tmp vlc + if HAVE_DARWIN # Create the MacOS X app +if BUILD_VLC noinst_DATA = VLC.app +endif # VLC-release.app is the old VLC.app target VLC-release.app: vlc - ( cd src && make ) - @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/MacOSX"; \ - fi + ( cd src && make install ) + rm -Rf "$(top_builddir)/tmp" + mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC-release.app - cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/ - cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX - for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ + cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done + for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done mkdir -p $(top_builddir)/tmp/modules/audio_output @@ -395,6 +374,8 @@ VLC-release.app: vlc prefs_widgets.m \ prefs.h \ prefs.m \ + simple_prefs.h \ + simple_prefs.m \ vout.h \ voutqt.m \ voutgl.m \ @@ -418,13 +399,13 @@ VLC-release.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ + cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ $(top_builddir)/VLC-release.app; \ rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS - ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/extras/MacOSX/Framework/Pre-Compile.sh + ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh $(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}` ; \ @@ -451,28 +432,28 @@ VLC-release.app: vlc $(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + done $(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js @@ -485,28 +466,28 @@ VLC-release.app: vlc $(INSTALL) -m 644 $(srcdir)/share/http/old/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old/.hosts for i in $(srcdir)/share/http/*.* ; do \ $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \ - done ; \ + done 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + 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 ; \ + done $(INSTALL) -m 644 $(srcdir)/share/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/requests/readme.txt $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ @@ -524,16 +505,13 @@ VLC-release.app: vlc VLC.app: vlc ( cd src && make install ) - @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/MacOSX"; \ - fi + rm -Rf $(top_builddir)/tmp + mkdir -p "$(top_builddir)/tmp/extras/package/macosx" rm -Rf $(top_builddir)/VLC.app - cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/ - cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX - for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \ + for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \ + cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \ + done + for i in AUTHORS COPYING THANKS; do \ cp "$(srcdir)/$$i" $(top_builddir)/tmp; \ done mkdir -p $(top_builddir)/tmp/modules/audio_output @@ -566,6 +544,8 @@ VLC.app: vlc prefs_widgets.m \ prefs.h \ prefs.m \ + simple_prefs.h \ + simple_prefs.m \ vout.h \ voutqt.m \ voutgl.m \ @@ -589,13 +569,13 @@ VLC.app: vlc cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ - cd ../../../ && \ - cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \ - $(top_builddir)/VLC.app; \ + cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \ + cd ../../../../ && \ + cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \ + $(top_builddir)/VLC.app rm -Rf $(top_builddir)/tmp $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS - $(INSTALL) $(top_builddir)/.libs/vlc \ + $(INSTALL) $(top_builddir)/src/.libs/vlc \ $(top_builddir)/VLC.app/Contents/MacOS/VLC ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules @@ -608,7 +588,7 @@ VLC.app: vlc $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \ - ln -sfn `pwd`/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ + ln -sfn `pwd`/$(srcdir)/po/$${i}.gmo $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \ mkdir -p $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ ln -sf ../English.lproj/InfoPlist.strings \ $(top_builddir)/VLC.app/Contents/Resources/$${i}.lproj ; \ @@ -618,15 +598,6 @@ VLC.app: vlc printf "APPLVLC#" >| $(top_builddir)/VLC.app/Contents/PkgInfo endif -if HAVE_WIN32 -DATA_win32_rc = $(noinst_share_vlc_win32_rc_DATA) -noinst_share_vlc_win32_rc_DATA = share/vlc_win32_rc.$(OBJEXT) -noinst_share_vlc_win32_rcdir = $(libdir) -share/vlc_win32_rc.$(OBJEXT): share/vlc_win32_rc.rc - $(WINDRES) -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 $@ -endif - - ############################################################################### # Building architecture-specific binary packages ############################################################################### @@ -645,16 +616,16 @@ package-win-common: fi # Copy relevant files - cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" - cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" + cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" + cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/" for file in AUTHORS MAINTAINERS THANKS ; \ 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 + do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done + unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt mkdir $(top_builddir)/vlc-$(VERSION)/locale cat $(top_srcdir)/po/LINGUAS | while read i; do \ @@ -742,16 +713,16 @@ package-win-common: if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla" - cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ; + cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ; endif if BUILD_ACTIVEX mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex" - cp $(srcdir)/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/ ; - cp $(srcdir)/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ ; + cp $(srcdir)/projects/activex/README.TXT $(top_builddir)/vlc-$(VERSION)/activex/ ; + cp $(srcdir)/projects/activex/test.html $(top_builddir)/vlc-$(VERSION)/activex/ ; unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ; - cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ; + cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ; endif # Rebase all those DLLs to speed up loading (need cygwin rebase) if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \ @@ -771,7 +742,7 @@ endif package-win32-base-debug: package-win-common # Copy relevant files - cp "$(top_builddir)/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" + cp "$(top_builddir)/extras/package/win32/vlc.win32.nsi" "$(top_builddir)/vlc-$(VERSION)/" mkdir -p "$(top_builddir)/vlc-$(VERSION)/plugins" for i in "" `$(VLC_CONFIG) --target plugin` ; do \ @@ -941,9 +912,9 @@ package-macosx: 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 ; + cp -R extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \ + cp extras/package/macosx/README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \ + cp extras/package/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 ; @@ -996,12 +967,12 @@ if BUILD_MOZILLA # Create Installer rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true mkdir -p "$(top_builddir)/macosx-plugin-instdata" - cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" + cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata" rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg" PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \ -f "$(top_builddir)/macosx-plugin-instdata" \ - -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \ - -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true + -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \ + -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true rm -rf "$(top_builddir)/macosx-plugin-instdata/" # Create disk image