SUBDIRS += libs/srtp
endif
if HAVE_ZLIB
+if !HAVE_MINIZIP
SUBDIRS += libs/unzip
endif
+endif
if BUILD_VLC
SUBDIRS += bin
endif
ChangeLog: Makefile.am
rm -f -- "$@"
cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
- ln -sf doc/ChangeLog-2008 "$@"
+ ln -sf doc/ChangeLog-2009 "$@"
###############################################################################
# MacOS X project
extras/package/macosx/plugin/InstallerInfo.plist.in \
extras/package/macosx/plugin/InstallerDescription.plist \
extras/package/macosx/plugin/pbdevelopment.plist \
- extras/package/macosx/plugin/English.lproj/InfoPlist.strings.in \
extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h \
extras/package/macosx/eyetvplugin/Info.plist \
extras/package/macosx/eyetvplugin/eyetvplugin.c \
noinst_SCRIPTS += vlc$(EXEEXT)
endif
-vlc$(EXEEXT): Makefile.am
- rm -f -- vlc vlc.tmp
- echo '#! /bin/sh' > vlc.tmp
- echo 'exec "$$(dirname "$$0")/bin/vlc-static$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
- chmod +x vlc.tmp
- mv -f -- vlc.tmp vlc
+vlc$(EXEEXT):
+ ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
if HAVE_DARWIN
if BUILD_VLC
find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
# This is just for development purposes.
-# The resulting VLC.app will only in this tree.
+# The resulting VLC.app will only run in this tree.
VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
(cd src && make install)
rm -Rf $(top_builddir)/tmp
## Win ##
############################################################################
win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_debugdir=$(top_builddir)/symbols-$(VERSION)
+npvlc=vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)
+axvlc=vlc-$(VERSION)/activex/axvlc$(LIBEXT)
win32_lua_destdir=$(win32_destdir)/lua
win32_http_destdir=$(win32_destdir)/http
for i in $(top_builddir)/share/skins2/*.*; do \
cp -- "$$i" $(win32_destdir)/skins/ || true ; \
done
+ cp -- $(srcdir)/share/skins2/skin.catalog $(win32_destdir)/skins/ || true ;
+ cp -- $(srcdir)/share/skins2/skin.dtd $(win32_destdir)/skins/ || true ;
endif
if BUILD_OSDMENU
#strip exe and main dll
package-win-common-strip: package-win32-base-debug
+ @if test -e "$(win32_debugdir)"; then \
+ echo "Error: please remove $(win32_debugdir), it is in the way"; \
+ false; \
+ else \
+ echo "OK."; mkdir -p "$(win32_debugdir)"; \
+ fi
for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
- do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi; done
+
if BUILD_MOZILLA
- $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
+ $(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
- $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
+ $(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 $(STRIP) "$$i" ; fi ; done
+ do if test -n "$$i" ; then \
+ $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
+ $(OBJCOPY) --strip-debug "$$i" ; \
+ $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \
+ mv "$$i.dbg" "$(win32_debugdir)"; \
+ fi ; done
package-win32-base-exe: package-win32-base
# Create package