version 1.131, 2008/04/30 15:12:06
|
version 1.132, 2008/05/27 07:10:34
|
Line 11 THOTINCLUDES = @THOTINCLUDES@
|
Line 11 THOTINCLUDES = @THOTINCLUDES@
|
include Options |
include Options |
|
|
LIBWWW = libwww |
LIBWWW = libwww |
REDLAND = redland |
|
|
|
#MKP: adding davlib |
#MKP: adding davlib |
SUBDIRS = @SUBDIRS@ tools thotlib batch annotlib @DAVDIR@ amaya |
SUBDIRS = @SUBDIRS@ tools thotlib batch annotlib @DAVDIR@ amaya |
EXTRA_SUBDIRS= $(LIBWWW) $(REDLAND) $(WX_BUILDDIR) $(GL_BUILDDIR) |
EXTRA_SUBDIRS= raptor $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR) |
|
|
prefix = @prefix@ |
prefix = @prefix@ |
exec_prefix = @exec_prefix@ |
exec_prefix = @exec_prefix@ |
Line 24 bindir = @bindir@
|
Line 23 bindir = @bindir@
|
|
|
srcdir = $(THOTDIR) |
srcdir = $(THOTDIR) |
|
|
default : tools gl @BUILDWXWIDGETS@ thotlib batch amaya_prog print_prog |
default : tools gl @BUILDWXWIDGETS@ @BUILDRAPTOR@ thotlib batch amaya_prog print_prog |
|
|
amaya : tools thotlib amaya_prog print_prog |
amaya : tools thotlib amaya_prog print_prog |
|
|
Line 253 libwww : libwww_config libwww_make
|
Line 252 libwww : libwww_config libwww_make
|
@($(ECHO) "libwww is installed") |
@($(ECHO) "libwww is installed") |
|
|
# |
# |
# Rules to build the redland RDF library |
# Rules to build the raptor RDF library |
# |
# |
|
raptor: force |
# Previous rule used to link and compile expat inside redland... to be removed |
$(MAKE) -C raptor |
# after checking all is ok in all the platforms |
@($(ECHO) "raptor is installed") |
# we're using the expat from inside libwww |
|
# @(if test ! -e "$(THOTDIR)/../$(REDLAND)/expat" ; then \ |
|
# libwwwdir="$(THOTDIR)/../$(LIBWWW)" ; \ |
|
# echo $$libwwwdir ; \ |
|
# $(LN_S) "$$libwwwdir/modules/expat" "$(THOTDIR)/../$(REDLAND)/expat" ; \ |
|
# fi) |
|
|
|
# Because redland 0.9.14 forces the check on a glib-2.0 function, we remove the |
|
# results of the configure to force its non use. |
|
|
|
redland_config: @MAKEREDLAND@ force |
|
@(if test ! -e "$(THOTDIR)/../$(REDLAND)" ; then \ |
|
$(ECHO) "Error redland dir not found at $(THOTDIR)/$(REDLAND)" ; \ |
|
fi) |
|
@(if test ! -d "$(REDLAND)" ; then \ |
|
$(MKDIR) $(REDLAND) ; \ |
|
fi) |
|
@(localdir=`pwd` ; redlanddir="$$localdir/../../$(REDLAND)" ; \ |
|
cd $(REDLAND) ; unset LANG; \ |
|
if test ! -f Makefile -o ! -f redland-src-config ; then \ |
|
CPPFLAGS="-I$$localdir/../../$(LIBWWW)/modules/expat/lib" \ |
|
LDFLAGS="-L$$localdir/libwww/modules/expat -L$$localdir/libwww/modules/expat/.libs" \ |
|
$$redlanddir/configure \ |
|
--build=@build_alias@ --host=@host_alias@ --target=@target_alias@ \ |
|
--disable-shared \ |
|
--disable-nfc-check \ |
|
--without-bdb \ |
|
--with-raptor=internal \ |
|
--with-xml-parser=expat \ |
|
--with-www=none \ |
|
--without-libwww \ |
|
--without-openssl-digests \ |
|
--without-mysql ;\ |
|
$(ECHO) "redland is configured" ; \ |
|
fi) |
|
|
|
|
|
# the -DLIBRDF_INTERNAL=1 is needed if we're going to pass our own CFLAGS. |
|
redland_make: @MAKEREDLAND@ force |
|
@(cd $(REDLAND) ; \ |
|
$(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS) -DLIBRDF_INTERNAL=1"; \ |
|
) |
|
|
|
redland: @MAKEREDLAND@ redland_config redland_make |
|
@($(ECHO) "redland is installed") |
|
|
|
# |
# |
# This section try to maintain the Makefile(s) up-to-date in |
# This section try to maintain the Makefile(s) up-to-date in |