X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=184b27e787c7665c46534c8c7efdab9328c20525;hb=516de417906d883913760a012e9cea4806bf3973;hp=36d69cbdee771b8c2666dd6035fb679bf7c2fbf7;hpb=5b369300e5f7093ac99f2f626533e7f9bc9b66fb;p=vlc diff --git a/Makefile.am b/Makefile.am index 36d69cbdee..184b27e787 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,18 +39,11 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean) SUFFIXES = DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-skins2 -if USE_LIBTOOL -DISTCHECK_CONFIGURE_FLAGS += --enable-libtool -endif + --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 # Tell aclocal to use -I m4. Wonder if it really works. ACLOCAL_AMFLAGS = -I m4 -# XXX: these flags could be set in configure.ac, but we set them here -# because old versions of automake don't support them in configure.ac. -AUTOMAKE_OPTIONS = dist-bzip2 - ############################################################################### # MacOS X project ############################################################################### @@ -86,6 +79,9 @@ EXTRA_DIST += \ 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 \ @@ -156,6 +152,40 @@ EXTRA_DIST += \ 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/vlc.pbproj/project.pbxproj \ extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \ extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \ @@ -181,6 +211,7 @@ EXTRA_DIST += \ extras/vlc.vim \ extras/make.pl \ extras/valgrind.suppressions \ + extras/m4/autoconf260.m4 \ $(NULL) ############################################################################### @@ -215,9 +246,11 @@ bin_SCRIPTS = vlc-config vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in $(SHELL) ./config.status --file=$@ chmod 0755 $@ + touch $@ vlc-config.in: vlc-config.in.in ./config.status --recheck + touch $@ CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile @@ -245,9 +278,9 @@ vlc_LDADD = $(DATA_win32_rc) $(LIBVLC) vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` if USE_LIBTOOL -vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` LIB_libvlc = libvlc.la LIBVLC = src/$(LIB_libvlc) +vlc_LDFLAGS = else if BUILD_SHARED vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc @@ -392,11 +425,13 @@ VLC-release.app: vlc interaction.m \ embeddedwindow.h \ embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ + case $(host_os) in \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ cd ../../../; \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ @@ -532,11 +567,13 @@ VLC.app: vlc interaction.m \ embeddedwindow.h \ embeddedwindow.m \ + fspanel.h \ + fspanel.m \ vout.m; do \ cp "$(srcdir)/modules/gui/macosx/$$i" \ $(top_builddir)/tmp/modules/gui/macosx; \ done - case $(target_triplet) in \ + case $(host_os) in \ *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \ cd ../../../; \ cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \ @@ -680,7 +717,6 @@ endif if BUILD_MOZILLA mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla" cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ; - cp $(top_builddir)/mozilla/vlcintf.xpt $(top_builddir)/vlc-${VERSION}/mozilla/ ; endif if BUILD_ACTIVEX @@ -766,7 +802,7 @@ package-win32-base-exe-linux: package-win32-base-zip: package-win32-base # Create package - zip -r vlc-${VERSION}-win32.zip vlc-${VERSION} + zip -r -9 vlc-${VERSION}-win32.zip vlc-${VERSION} package-win32-base-7zip: package-win32-base # Create package @@ -933,8 +969,9 @@ update-po: | sort ; \ echo "" ; \ echo "# modules" ; \ - find modules -name '*.[chm]' -o -name '*.[ch]pp' \ + find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\ | grep -v '\(\.moc\.\|gui/gtk2/\)' \ + | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \ | sort ; \ } > $(top_srcdir)/po/POTFILES.in rm -f $(top_srcdir)/po/vlc.pot