make dist fixes
This commit is contained in:
John Cupitt
parent
1d10569f0f
commit
8a081f08da
@ -1,6 +1,7 @@
|
||||
9/11/09 started 7.20.0
|
||||
- removed vips-7.x.spec.in, shouldn't really have this in SVN
|
||||
- bumped version to 7.20
|
||||
- fixes to get "make dist" working again
|
||||
|
||||
3/4/09 started 7.19.0
|
||||
- version bump
|
||||
|
||||
@ -22,7 +22,6 @@ EXTRA_DIST = \
|
||||
bootstrap.sh \
|
||||
vipsCC-7.${IM_MINOR_VERSION}.pc.in \
|
||||
vips-7.${IM_MINOR_VERSION}.pc.in \
|
||||
vips-7.${IM_MINOR_VERSION}.spec.in \
|
||||
acinclude.m4 \
|
||||
depcomp \
|
||||
$(P_DIST_DIR)
|
||||
|
||||
@ -522,7 +522,7 @@ AC_OUTPUT([
|
||||
libvips/resample/Makefile
|
||||
libvips/video/Makefile
|
||||
libvipsCC/include/Makefile
|
||||
libvipsCC/include/vipsCC/Makefile
|
||||
libvipsCC/include/vips/Makefile
|
||||
libvipsCC/Makefile
|
||||
tools/Makefile
|
||||
tools/iofuncs/Makefile
|
||||
|
||||
@ -4,7 +4,4 @@ SUBDIRS = reference
|
||||
EXTRA_DIST = \
|
||||
html \
|
||||
pdf \
|
||||
src \
|
||||
makefile.tex \
|
||||
Makehtmlman \
|
||||
README
|
||||
src
|
||||
|
||||
@ -1,93 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Make html in html/man from the man pages in the named
|
||||
# directories
|
||||
|
||||
# Config stuff
|
||||
out_dir=`pwd`/html/man
|
||||
|
||||
# print usage and exit
|
||||
usage() {
|
||||
echo usage: $0 dir1 dir2 ...
|
||||
echo make html in $out_dir from the man pages in the
|
||||
echo named directories
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
# If a dir does not exist, make it
|
||||
makedir() {
|
||||
if test ! -d "$1"; then
|
||||
mkdir "$1"
|
||||
status=$?
|
||||
if test $status -ne 0 && test ! -d "$1"; then
|
||||
exit $status
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
makedir `pwd`/html
|
||||
makedir `pwd`/html/man
|
||||
makedir $out_dir
|
||||
|
||||
# echo the filename given a path
|
||||
filename() {
|
||||
echo ${1/#*\//}
|
||||
}
|
||||
|
||||
# echo the dirname given a path... make sure there's a trailing slash
|
||||
dirname() {
|
||||
# break off the filename, then junk that many chars off the end of
|
||||
# $1 to make the dirname
|
||||
local file=`filename $1`
|
||||
local dir=${1:0:$((${#1}-${#file}))}
|
||||
|
||||
# is dir "/"? return immediately
|
||||
if test "$dir" == "/"; then
|
||||
echo "/"
|
||||
return
|
||||
fi
|
||||
|
||||
# remove trailing slash, provided we're not removing everything
|
||||
dir=${dir/%\//}
|
||||
|
||||
# if there's no dir, we must be in the current dir
|
||||
if test "$dir" == ""; then
|
||||
dir="."
|
||||
fi
|
||||
|
||||
# finally add a trailing "/" back again
|
||||
echo $dir/
|
||||
}
|
||||
|
||||
# Need VIPSHOME
|
||||
export VIPSHOME=`vips im_guess_prefix im_version VIPSHOME`
|
||||
|
||||
: ${VIPSHOME:?}
|
||||
|
||||
if test $# -le 0; then
|
||||
usage
|
||||
fi
|
||||
|
||||
# Loop over args, adding source man pages
|
||||
for dir in $*; do
|
||||
if test -d "$dir"; then
|
||||
files="$files $dir/*.[0-9]"
|
||||
else
|
||||
echo "$0: directory $dir does not exist"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# Make output!
|
||||
let j=0
|
||||
for i in $files; do
|
||||
file=`filename $i`
|
||||
dir=`dirname $i`
|
||||
|
||||
( cd $dir/.. ;
|
||||
rman -f html -r '%s.%s.html' $dir$file > $out_dir/$file.html )
|
||||
let j+=1
|
||||
done
|
||||
|
||||
echo "$0: made $j pages of html"
|
||||
15
doc/README
15
doc/README
@ -1,15 +0,0 @@
|
||||
VIPS documentation
|
||||
|
||||
edit makefile.tex and change "prefix" to be your install prefix (eg.
|
||||
"/usr/local/vips-7.8") ... the HTML man page maker will pull manual pages from
|
||||
this area
|
||||
|
||||
type 'make' to rebuild postscript and html. You will need gnu make, latex
|
||||
and latex2html. It will also scan the VIPS man pages and build a set of
|
||||
HTML versions using the Makehtmlman script.
|
||||
|
||||
src/intro/ has some MS word documents written by Joe Padfield while at the
|
||||
Hamilton-Karr.
|
||||
|
||||
once everything has built, copy the html and ps directories to
|
||||
$prefix/share/doc/vips
|
||||
@ -28,12 +28,12 @@ all: $(PDF) html
|
||||
|
||||
install: all $(PDF) html
|
||||
-rm -rf ${destdir}/pdf/*.pdf
|
||||
-rm -rf ${destdir}/html/manual/vips*
|
||||
-rm -rf ${destdir}/html/manual/figs
|
||||
-rm -rf ${destdir}/html/vips*
|
||||
-rm -rf ${destdir}/html/figs
|
||||
$(mkinstalldirs) ${destdir}/pdf
|
||||
$(mkinstalldirs) ${destdir}/html/manual
|
||||
$(mkinstalldirs) ${destdir}/html
|
||||
-cp $(PDF) ${destdir}/pdf
|
||||
-cp -r vipsmanual/* ${destdir}/html/manual
|
||||
-cp -r vipsmanual/* ${destdir}/html
|
||||
|
||||
$(PDF): $(SRC)
|
||||
pdflatex vipsmanual.tex
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
pkginclude_HEADERS = \
|
||||
almostdeprecated.h \
|
||||
deprecated.h \
|
||||
arithmetic.h \
|
||||
boolean.h \
|
||||
buf.h \
|
||||
@ -43,7 +44,6 @@ pkginclude_HEADERS = \
|
||||
transform.h \
|
||||
util.h \
|
||||
version.h \
|
||||
vips \
|
||||
vips.h
|
||||
|
||||
vipsc++.h:
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
// Include file to get all VIPS C++ bindings
|
||||
|
||||
// Programs should include <vipsCC/vips>, but for compatibility we allow
|
||||
// <vips/vips> as well, hence this file
|
||||
|
||||
/*
|
||||
|
||||
This file is part of VIPS.
|
||||
|
||||
VIPS is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
*/
|
||||
|
||||
/*
|
||||
|
||||
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
|
||||
|
||||
*/
|
||||
|
||||
#include <vipsCC/vips>
|
||||
@ -1,3 +1,6 @@
|
||||
SUBDIRS = \
|
||||
include
|
||||
|
||||
INCLUDES = \
|
||||
-I$(top_srcdir)/libvips/include \
|
||||
-I$(top_srcdir)/libvipsCC/include \
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
#include <vips/internal.h>
|
||||
#include <vips/debug.h>
|
||||
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
|
||||
#include <vips/vips.h>
|
||||
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
|
||||
#ifdef WITH_DMALLOC
|
||||
#include <dmalloc.h>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
|
||||
SUBDIRS = vipsCC
|
||||
SUBDIRS = vips
|
||||
|
||||
@ -101,9 +101,9 @@
|
||||
#define VIPS_NAMESPACE_START namespace vips {
|
||||
#define VIPS_NAMESPACE_END }
|
||||
|
||||
#include <vipsCC/VError.h>
|
||||
#include <vipsCC/VDisplay.h>
|
||||
#include <vipsCC/VMask.h>
|
||||
#include <vipsCC/VImage.h>
|
||||
#include <vips/VError.h>
|
||||
#include <vips/VDisplay.h>
|
||||
#include <vips/VMask.h>
|
||||
#include <vips/VImage.h>
|
||||
|
||||
#endif /*IM_VIPS*/
|
||||
@ -32,7 +32,7 @@
|
||||
#ifndef IM_VIPSCPP_H
|
||||
#define IM_VIPSCPP_H
|
||||
|
||||
#include <vipsCC/vips>
|
||||
#include <vips/vips>
|
||||
|
||||
using namespace vips;
|
||||
|
||||
1129
po/POTFILES.in
1129
po/POTFILES.in
File diff suppressed because it is too large
Load Diff
BIN
po/en_GB.gmo
BIN
po/en_GB.gmo
Binary file not shown.
4140
po/en_GB.po
4140
po/en_GB.po
File diff suppressed because it is too large
Load Diff
@ -19,7 +19,7 @@ vipscc_PYTHON = VImage.py VDisplay.py VError.py VMask.py __init__.py
|
||||
# need an expanded VImage.h ... SWIG's preprocessor b0rks on includes inside
|
||||
# class definitions
|
||||
vimagemodule.cxx: VImage.i
|
||||
cpp -DSWIG -E $(top_srcdir)/libvipsCC/include/vipsCC/VImage.h > VImage.h
|
||||
cpp -DSWIG -E $(top_srcdir)/libvipsCC/include/vips/VImage.h > VImage.h
|
||||
swig -python -c++ -interface $(@:.cxx=) -I$(top_srcdir)/libvipsCC/include -o $@ $<
|
||||
|
||||
vdisplaymodule.cxx: VDisplay.i
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
%module VDisplay
|
||||
%{
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
%}
|
||||
|
||||
%import "VError.i"
|
||||
@ -12,4 +12,4 @@
|
||||
*/
|
||||
%rename(__assign__) *::operator=;
|
||||
|
||||
%include vipsCC/VDisplay.h
|
||||
%include vips/VDisplay.h
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
%module VError
|
||||
%{
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
%}
|
||||
|
||||
%include "std_except.i"
|
||||
%include "std_string.i"
|
||||
|
||||
%include vipsCC/VError.h
|
||||
%include vips/VError.h
|
||||
|
||||
%extend vips::VError {
|
||||
const char *__str__ () {
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
%module VImage
|
||||
|
||||
%{
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
|
||||
/* We need the C API too for the args init and some of the
|
||||
* frombuffer/tobuffer stuff.
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
%module VMask
|
||||
%{
|
||||
#include <stdexcept>
|
||||
#include <vipsCC/vipscpp.h>
|
||||
#include <vips/vipscpp.h>
|
||||
%}
|
||||
|
||||
%import "VError.i"
|
||||
@ -32,4 +32,4 @@
|
||||
%rename(convert_VIMask) vips::VDMask::operator vips::VIMask;
|
||||
%rename(convert_VDMask) vips::VIMask::operator vips::VDMask;
|
||||
|
||||
%include vipsCC/VMask.h
|
||||
%include vips/VMask.h
|
||||
|
||||
@ -9,7 +9,7 @@ bin_SCRIPTS = \
|
||||
noinst_SCRIPTS = post_install
|
||||
|
||||
EXTRA_DIST = \
|
||||
vips-7.18 \
|
||||
vips-7.20 \
|
||||
${noinst_SCRIPTS} \
|
||||
light_correct.in \
|
||||
shrink_width.in \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user