update
svn: r2014
This commit is contained in:
parent
4af6e2a0c2
commit
05ca4d93eb
@ -1,3 +1,12 @@
|
|||||||
|
2003-08-15 Don Allingham <dallingham@users.sourceforge.net>
|
||||||
|
* src/gramps.glade: New tool icon
|
||||||
|
* src/gramps_main.py: handle back/fwd buttons, disabling when
|
||||||
|
not appropriate
|
||||||
|
* src/people48.png: new image
|
||||||
|
* src/family48.png: new image
|
||||||
|
* src/tools.png: new image
|
||||||
|
* src/Makefile.am: added tools.png for installation
|
||||||
|
|
||||||
2003-08-15 Alex Roitman <shura@alex.neuro.umn.edu>
|
2003-08-15 Alex Roitman <shura@alex.neuro.umn.edu>
|
||||||
* src/gramps.glade: Add Go menu with navigation items. Still have to
|
* src/gramps.glade: Add Go menu with navigation items. Still have to
|
||||||
work out the history menu being built at runtime. Add few shortcuts.
|
work out the history menu being built at runtime. Add few shortcuts.
|
||||||
|
@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
78
configure
vendored
78
configure
vendored
@ -310,7 +310,7 @@ ac_includes_default="\
|
|||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG PYTHON22 ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX P22_INCLUDES GNOMEINC GNOMELIB INTLLIBS LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE RELEASE VERSIONSTRING MSGFMT LANGUAGES POFILES MOFILES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BINSH SWIG ZIP CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP HAVE_PKG_CONFIG PYTHON_CPPFLAGS SK_CONFIG SCROLLKEEPER_BUILD_REQUIRED GNOMEHELP GPREFIX GNOMEINC GNOMELIB INTLLIBS LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@ -1981,51 +1981,6 @@ echo "${ECHO_T}no" >&6
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
if test "$PYTHON_VERSION" != "2.2"
|
|
||||||
then
|
|
||||||
# Extract the first word of "python2.2", so it can be a program name with args.
|
|
||||||
set dummy python2.2; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_path_PYTHON22+set}" = set; then
|
|
||||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
else
|
|
||||||
case $PYTHON22 in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_PYTHON22="$PYTHON22" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
ac_cv_path_PYTHON22="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
break 2
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
PYTHON22=$ac_cv_path_PYTHON22
|
|
||||||
|
|
||||||
if test -n "$PYTHON22"; then
|
|
||||||
echo "$as_me:$LINENO: result: $PYTHON22" >&5
|
|
||||||
echo "${ECHO_T}$PYTHON22" >&6
|
|
||||||
else
|
|
||||||
echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
echo "${ECHO_T}no" >&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
else
|
|
||||||
PYTHON22=$PYTHON
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Extract the first word of "zip", so it can be a program name with args.
|
# Extract the first word of "zip", so it can be a program name with args.
|
||||||
set dummy zip; ac_word=$2
|
set dummy zip; ac_word=$2
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||||
@ -3996,24 +3951,17 @@ echo "${ECHO_T}ok" >&6
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: checking for headers required to compile python extensions" >&5
|
echo "$as_me:$LINENO: checking for Python include directory" >&5
|
||||||
echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6
|
echo $ECHO_N "checking for Python include directory... $ECHO_C" >&6
|
||||||
|
if test "${gramps_cv_python_inc+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
gramps_cv_python_inc=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null`
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $gramps_cv_python_inc" >&5
|
||||||
|
echo "${ECHO_T}$gramps_cv_python_inc" >&6
|
||||||
|
PYTHON_CPPFLAGS="-I$gramps_cv_python_inc"
|
||||||
|
|
||||||
if test "$PYTHON22" != ""; then
|
|
||||||
py_prefix=`$PYTHON22 -c "import sys; print sys.prefix"`
|
|
||||||
py_exec_prefix=`$PYTHON22 -c "import sys; print sys.exec_prefix"`
|
|
||||||
P22_INCLUDES="-I${py_prefix}/include/python2.2"
|
|
||||||
if test "$py_prefix" != "$py_exec_prefix"; then
|
|
||||||
P22_INCLUDES="$P22_INCLUDES -I${py_exec_prefix}/include/python2.2"
|
|
||||||
fi
|
|
||||||
if test -f "${py_exec_prefix}/include/python2.2/Python.h"
|
|
||||||
then
|
|
||||||
INTLLIBS="${INTLLIBS}intl22.so "
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$as_me:$LINENO: result: ok" >&5
|
|
||||||
echo "${ECHO_T}ok" >&6
|
|
||||||
|
|
||||||
# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
|
# Extract the first word of "scrollkeeper-config", so it can be a program name with args.
|
||||||
set dummy scrollkeeper-config; ac_word=$2
|
set dummy scrollkeeper-config; ac_word=$2
|
||||||
@ -4079,7 +4027,6 @@ SCROLLKEEPER_BUILD_REQUIRED=0.3.5
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh"
|
ac_config_files="$ac_config_files Makefile src/Makefile src/const.py src/docgen/Makefile src/filters/Makefile src/plugins/Makefile src/calendars/Makefile src/data/Makefile src/data/templates/Makefile src/po/Makefile doc/Makefile doc/gramps-manual/Makefile doc/gramps-manual/C/Makefile example/Makefile example/gramps/Makefile gramps.spec gramps.sh"
|
||||||
|
|
||||||
cat >confcache <<\_ACEOF
|
cat >confcache <<\_ACEOF
|
||||||
@ -4785,7 +4732,6 @@ s,@pyexecdir@,$pyexecdir,;t t
|
|||||||
s,@pkgpyexecdir@,$pkgpyexecdir,;t t
|
s,@pkgpyexecdir@,$pkgpyexecdir,;t t
|
||||||
s,@BINSH@,$BINSH,;t t
|
s,@BINSH@,$BINSH,;t t
|
||||||
s,@SWIG@,$SWIG,;t t
|
s,@SWIG@,$SWIG,;t t
|
||||||
s,@PYTHON22@,$PYTHON22,;t t
|
|
||||||
s,@ZIP@,$ZIP,;t t
|
s,@ZIP@,$ZIP,;t t
|
||||||
s,@CC@,$CC,;t t
|
s,@CC@,$CC,;t t
|
||||||
s,@CFLAGS@,$CFLAGS,;t t
|
s,@CFLAGS@,$CFLAGS,;t t
|
||||||
@ -4804,11 +4750,11 @@ s,@CCDEPMODE@,$CCDEPMODE,;t t
|
|||||||
s,@CPP@,$CPP,;t t
|
s,@CPP@,$CPP,;t t
|
||||||
s,@EGREP@,$EGREP,;t t
|
s,@EGREP@,$EGREP,;t t
|
||||||
s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
|
s,@HAVE_PKG_CONFIG@,$HAVE_PKG_CONFIG,;t t
|
||||||
|
s,@PYTHON_CPPFLAGS@,$PYTHON_CPPFLAGS,;t t
|
||||||
s,@SK_CONFIG@,$SK_CONFIG,;t t
|
s,@SK_CONFIG@,$SK_CONFIG,;t t
|
||||||
s,@SCROLLKEEPER_BUILD_REQUIRED@,$SCROLLKEEPER_BUILD_REQUIRED,;t t
|
s,@SCROLLKEEPER_BUILD_REQUIRED@,$SCROLLKEEPER_BUILD_REQUIRED,;t t
|
||||||
s,@GNOMEHELP@,$GNOMEHELP,;t t
|
s,@GNOMEHELP@,$GNOMEHELP,;t t
|
||||||
s,@GPREFIX@,$GPREFIX,;t t
|
s,@GPREFIX@,$GPREFIX,;t t
|
||||||
s,@P22_INCLUDES@,$P22_INCLUDES,;t t
|
|
||||||
s,@GNOMEINC@,$GNOMEINC,;t t
|
s,@GNOMEINC@,$GNOMEINC,;t t
|
||||||
s,@GNOMELIB@,$GNOMELIB,;t t
|
s,@GNOMELIB@,$GNOMELIB,;t t
|
||||||
s,@INTLLIBS@,$INTLLIBS,;t t
|
s,@INTLLIBS@,$INTLLIBS,;t t
|
||||||
|
@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -140,11 +140,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -80,11 +80,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
%define ver 0.9.3
|
%define ver 0.9.3
|
||||||
%define rel 0.CVS20030813
|
%define rel 0.CVS20030815
|
||||||
%define prefix /usr
|
%define prefix /usr
|
||||||
%define localstatedir /var/lib
|
%define localstatedir /var/lib
|
||||||
# Ensure that internal RPM macros for configure & makeinstall
|
# Ensure that internal RPM macros for configure & makeinstall
|
||||||
|
@ -78,11 +78,10 @@ INTLLIBS = intl22.so
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
@ -107,7 +106,6 @@ pythondir = @pythondir@
|
|||||||
SUBDIRS = docgen filters plugins data po calendars
|
SUBDIRS = docgen filters plugins data po calendars
|
||||||
|
|
||||||
# For intl. support, how do we compile?
|
# For intl. support, how do we compile?
|
||||||
GVFSINC = @GPREF@
|
|
||||||
CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@
|
CFLAGS = -fPIC -shared -O @GNOMEINC@ @CFLAGS@ @CPPFLAGS@ -I@includedir@
|
||||||
LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@
|
LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@
|
||||||
CLEANFILES = $(INTLLIBS) grampslib.so
|
CLEANFILES = $(INTLLIBS) grampslib.so
|
||||||
@ -235,7 +233,8 @@ GRAPHICS = \
|
|||||||
people.xpm\
|
people.xpm\
|
||||||
place.png\
|
place.png\
|
||||||
sources.png\
|
sources.png\
|
||||||
splash.jpg
|
splash.jpg\
|
||||||
|
tools.png
|
||||||
|
|
||||||
|
|
||||||
# Other stuff that we need to install
|
# Other stuff that we need to install
|
||||||
@ -561,10 +560,10 @@ all-local: $(INTLLIBS) grampslib.so
|
|||||||
# These can probably be done in a better or more elegant/generic way
|
# These can probably be done in a better or more elegant/generic way
|
||||||
# eventually (libtool?), but this works.
|
# eventually (libtool?), but this works.
|
||||||
intl22.so: $(srcdir)/intl.c
|
intl22.so: $(srcdir)/intl.c
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) @P22_INCLUDES@ -DVER22 -o $@ $(srcdir)/intl.c
|
$(CC) $(CFLAGS) $(LDFLAGS) $(PYTHON_CPPFLAGS) -DVER22 -o $@ $(srcdir)/intl.c
|
||||||
|
|
||||||
grampslib.so: $(srcdir)/grampslib_wrap.c
|
grampslib.so: $(srcdir)/grampslib_wrap.c
|
||||||
$(CC) $(CFLAGS) @P22_INCLUDES@ -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS)
|
$(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -o $@ $(srcdir)/grampslib_wrap.c $(LDFLAGS)
|
||||||
|
|
||||||
# In principle the following rule slightly violates the automake/autoconf
|
# In principle the following rule slightly violates the automake/autoconf
|
||||||
# spirit of keeping each subdirectory as a separate entity unto itself.
|
# spirit of keeping each subdirectory as a separate entity unto itself.
|
||||||
|
@ -83,11 +83,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -82,11 +82,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -79,11 +79,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
@ -78,11 +78,10 @@ INTLLIBS = @INTLLIBS@
|
|||||||
LANGUAGES = @LANGUAGES@
|
LANGUAGES = @LANGUAGES@
|
||||||
MOFILES = @MOFILES@
|
MOFILES = @MOFILES@
|
||||||
MSGFMT = @MSGFMT@
|
MSGFMT = @MSGFMT@
|
||||||
P22_INCLUDES = @P22_INCLUDES@
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
POFILES = @POFILES@
|
POFILES = @POFILES@
|
||||||
PYTHON = @PYTHON@
|
PYTHON = @PYTHON@
|
||||||
PYTHON22 = @PYTHON22@
|
PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
|
||||||
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
|
||||||
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
PYTHON_PLATFORM = @PYTHON_PLATFORM@
|
||||||
PYTHON_PREFIX = @PYTHON_PREFIX@
|
PYTHON_PREFIX = @PYTHON_PREFIX@
|
||||||
|
Loading…
Reference in New Issue
Block a user