summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-11-02 19:48:50 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-11-02 19:48:50 +0000
commit1a8d6dc477445efe8f0a5eca2635eafaed7825ee (patch)
treec04ae8d506b29bbf709e3a9059d6eccbb6a99cb1
parent8865a6f75524c8f9ca9e17cc2d6d7b27cf7e46ec (diff)
downloadnetsurf-1a8d6dc477445efe8f0a5eca2635eafaed7825ee.tar.gz
netsurf-1a8d6dc477445efe8f0a5eca2635eafaed7825ee.tar.bz2
Remove libhpdf.so (as pdf export disabled currently) and libvpx.so (as we have to
static link due to unspecified problems). Clear up the commented-out list of shared objects. svn path=/trunk/netsurf/; revision=10934
-rwxr-xr-xamiga/dist/Install2
-rwxr-xr-xamiga/pkg/makepackage5
2 files changed, 3 insertions, 4 deletions
diff --git a/amiga/dist/Install b/amiga/dist/Install
index b3cf3d929..ba7a3dec0 100755
--- a/amiga/dist/Install
+++ b/amiga/dist/Install
@@ -449,7 +449,7 @@
(p_linksobj "libz.so.1.2.5" "libz.so")
(p_linksobj "libz.so.1.2.5" "libz.so.1")
(p_linksobj "libz.so.1.2.5" "libz.so.1.2")
- (p_linksobj "libvpx.so.0.9.2" "libvpx.so.0")
+; (p_linksobj "libvpx.so.0.9.5" "libvpx.so.0")
; (p_linksobj "libpng14.so.14" "libpng.so")
)
)
diff --git a/amiga/pkg/makepackage b/amiga/pkg/makepackage
index 5d3e7ee0f..41237db63 100755
--- a/amiga/pkg/makepackage
+++ b/amiga/pkg/makepackage
@@ -21,6 +21,5 @@ copy amiga/pkg/fitr ram:NetSurf/
makedir ram:NetSurf/Rexx
copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
makedir ram:NetSurf/SObjs
-copy sobjs:libjpeg.so.8 sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libiconv.so sobjs:libvpx.so.0.9.2 ram:NetSurf/SObjs clone
-;sobjs:libssl-0.9.8.so sobjs:libexpat.so sobjs:libpng14.so.14
-;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so \ No newline at end of file
+copy sobjs:libjpeg.so.8 sobjs:libhubbub.so.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so.1.2.5 sobjs:libiconv.so ram:NetSurf/SObjs clone
+;sobjs:libhpdf-2.2.0.so.0.0