← Back to branch summary

~ubuntu-branches/ubuntu/maverick/vlc/maverick

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-12-07 23:12:27 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20081207231227-1h5zp3boi9qq0qk9
Tags: 0.9.8a-1ubuntu1
https://launchpad.net/bugs/300328
https://launchpad.net/bugs/305100
https://launchpad.net/bugs/289263
* merge from debian. LP: #300328, #305100, #289263
* Fixes CVE-2008-5276
* remaining changes
  - build against libxul-dev instead of iceape-dev
  - build against libdca-dev, libass-dev and libx264-dev
  - build against and install libx264 plugin
  - adjust Vcs-Bzr Headers in debian/control
  - add Xb-Npp header to vlc package
  - debian/patches/301_DVD_media.diff: Change %U to %f
     in VLC .desktop file, cf LP #275043

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
36
36
        INSTALL.win32 \
37
37
        INSTALL.wince \
38
38
        extras/package/win32/vlc.exe.manifest \
 
39
        extras/package/win32/libvlc.dll.manifest \
39
40
        MAINTAINERS \
40
41
        extras/package/macosx/README.MacOSX.rtf \
41
42
        vlc-config.in.in \
48
49
        extras/package/win32/languages/french.nsh
49
50
 
50
51
dist_noinst_SCRIPTS = bootstrap toolbox
 
52
nodist_noinst_SCRIPTS = compile
51
53
 
52
 
BUILT_SOURCES_distclean = vlc-config compile extras/package/win32/vlc.win32.nsi
 
54
BUILT_SOURCES_distclean = vlc-config extras/package/win32/vlc.win32.nsi
53
55
if HAVE_DARWIN
54
56
BUILT_SOURCES_clean = macosx-sdk
55
57
else
690
692
# Copy executables and libs
691
693
        cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
692
694
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
 
695
                cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
693
696
        cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
694
697
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "$(win32_destdir)/"
695
698
 
718
721
if BUILD_MOZILLA
719
722
        mkdir -p "$(win32_destdir)/mozilla"
720
723
        cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
 
724
        cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
721
725
endif
722
726
 
723
727
# ActiveX plugin
728
732
        unix2dos $(win32_destdir)/activex/*
729
733
 
730
734
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
 
735
        cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
731
736
endif
732
737
 
733
738
# Rebase all those DLLs to speed up loading (need cygwin rebase)
749
754
            $(INSTALL) "$$i" "vlc-$(VERSION)/plugins/" ; \
750
755
          fi ; done
751
756
 
 
757
# Contrib *.dll's
 
758
        cp $(srcdir)/extras/contrib/lib/*.dll "vlc-$(VERSION)/" || true 
 
759
 
752
760
# Copy the lua scripts (HTTP)
753
761
if BUILD_LUA
754
762
        mkdir -p "$(win32_lua_destdir)/http/images"
882
890
 
883
891
#strip exe and main dll
884
892
package-win-common-strip: package-win32-base-debug
885
 
        $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
886
 
        $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
887
 
        $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
 
893
        for i in "" vlc-$(VERSION)/*$(LIBEXT) ; \
 
894
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi; done
888
895
if BUILD_MOZILLA
889
896
        $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
890
897
endif
1088
1095
        mkdir -p "$(top_builddir)/macosx-plugin-instdata"
1089
1096
        cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
1090
1097
        rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
1091
 
        PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
 
1098
        export PACKAGEMAKER=
 
1099
        if test -x /Developer/Tools/packagemaker; then \
 
1100
           export PACKAGEMAKER=/Developer/Tools/packagemaker; \
 
1101
        fi; \
 
1102
        if test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then \
 
1103
           export PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; \
 
1104
        fi; \
 
1105
        $${PACKAGEMAKER} -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
1092
1106
        -f "$(top_builddir)/macosx-plugin-instdata" \
1093
1107
        -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
1094
1108
        -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true