X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=f3ad1e465d0ecc1eea1eddc16af1504667ff0256;hb=f32ccae3de6361d14023e66823b7cc8ce5ddf5fe;hp=c9a3b14138af90583be6205433f5da63698c6c45;hpb=fdc86de62bbb56647f3af5555f1f9f70ff43387e;p=vlc diff --git a/Makefile.am b/Makefile.am index c9a3b14138..f3ad1e465d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -70,7 +70,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --enable-fast-install \ --disable-dbus \ --disable-dvd --disable-mad --disable-libmpeg2 \ - --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \ + --disable-ffmpeg --disable-faad --disable-skins2 \ --disable-live555 \ --disable-fribidi --disable-glx @@ -95,34 +95,25 @@ ChangeLog: Makefile.am EXTRA_DIST += \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/MediaInfo.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/MediaInfo.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/designable.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/designable.nib \ extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/Preferences.nib/designable.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/designable.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/designable.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/designable.nib \ extras/package/macosx/Resources/English.lproj/Extended.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/designable.nib \ extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/CoreDialogs.nib/keyedobjects.nib \ - extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/classes.nib \ - extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/info.nib \ + extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/designable.nib \ extras/package/macosx/Resources/English.lproj/ErrorPanel.nib/keyedobjects.nib \ extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \ extras/package/macosx/Resources/aiff.icns \ @@ -328,7 +319,7 @@ CLEANFILES = $(BUILT_SOURCES_clean) DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile MAINTAINERCLEANFILES = ChangeLog -# Shortcut for developpers to rebuild the core (libvlc + vlc) +# Shortcut for developers 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 libcompat: @@ -379,7 +370,7 @@ endif # Building aliases ############################################################################### -ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc mvlc +ALL_ALIASES = cvlc rvlc svlc qvlc nvlc mvlc bin_SCRIPTS = $(ALIASES) CLEANFILES += $(ALIASES) $(noinst_SCRIPTS) EXTRA_SCRIPTS = $(ALL_ALIASES) @@ -397,9 +388,6 @@ rvlc: make-alias Makefile svlc: make-alias Makefile $(MKALIAS) skins2 -wxvlc: make-alias Makefile - $(MKALIAS) wx - qvlc: make-alias Makefile $(MKALIAS) qt4 @@ -572,8 +560,6 @@ VLC-release.app: vlc $(top_builddir)/VLC-release.app/Contents/Resources/$${i}.lproj ; \ done printf "APPLVLC#" >| $(top_builddir)/VLC-release.app/Contents/PkgInfo - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name classes.nib -delete; - find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name info.nib -delete; find $(top_builddir)/VLC-release.app/Contents/Resources/English.lproj -name designable.nib -delete; find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \; find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \; @@ -898,30 +884,17 @@ package-win-common-strip: package-win32-base-debug for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --strip-all "$$i" ; \ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ mv "$$i.dbg" "$(win32_debugdir)"; \ fi; done -if BUILD_MOZILLA - $(OBJCOPY) --only-keep-debug "$(npvlc)" "$(npvlc).dbg" - $(OBJCOPY) --strip-debug "$(npvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(npvlc).dbg" "$(npvlc)" - mv "$(npvlc).dbg" "$(win32_debugdir)" -endif -if BUILD_ACTIVEX - $(OBJCOPY) --only-keep-debug "$(axvlc)" "$(axvlc).dbg" - $(OBJCOPY) --strip-debug "$(axvlc)" - $(OBJCOPY) --add-gnu-debuglink="$(axvlc).dbg" "$(axvlc)" - mv "$(axvlc).dbg" "$(win32_debugdir)" -endif - #strip all plugins dll package-win32-base: package-win-common-strip for i in "" $(win32_destdir)/plugins/*$(LIBEXT) ; \ do if test -n "$$i" ; then \ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \ - $(OBJCOPY) --strip-debug "$$i" ; \ + $(OBJCOPY) --strip-all "$$i" ; \ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \ mv "$$i.dbg" "$(win32_debugdir)"; \ fi ; done