[BACK]Return to Makefile.in CVS log [TXT] [DIR] Up to [Public] / Amaya

Diff for /Amaya/Makefile.in between versions 1.125 and 1.126

version 1.125, 2007/04/25 09:44:44 version 1.126, 2007/06/05 16:22:05
Line 12  LIBZ = @LIBZ@ Line 12  LIBZ = @LIBZ@
 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= redland $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)  EXTRA_SUBDIRS= $(LIBWWW) $(REDLAND) $(WX_BUILDDIR) $(GL_BUILDDIR)
   
 prefix = @prefix@  prefix = @prefix@
 exec_prefix = @exec_prefix@  exec_prefix = @exec_prefix@
Line 24  bindir = @bindir@ Line 25  bindir = @bindir@
   
 srcdir  = $(THOTDIR)  srcdir  = $(THOTDIR)
   
 default : tools gl @BUILDWXWIDGETS@ @BUILDREDLAND@ thotlib batch amaya_prog print_prog  default : tools gl @BUILDWXWIDGETS@ thotlib batch amaya_prog print_prog
   
 amaya : tools thotlib amaya_prog print_prog  amaya : tools thotlib amaya_prog print_prog
   
Line 104  update : Line 105  update :
 commit :  commit :
         @(cd $(THOTDIR) ; cvs commit)          @(cd $(THOTDIR) ; cvs commit)
   
 #       @(PWD=`pwd` ; PATH="$$PWD/bin:$$PATH" ; export PATH ; \  
 #         if test -d $$PWD/$(THOTDIR) ; then CLASSES=$$PWD/$(THOTDIR)/classes;\  
 #         else CLASSES=$(THOTDIR)/classes ; fi ; \  
 #         CLASSPATH=".:$$CLASSES:$$CLASSES/classes.zip:$$CLASSES/thotlib.zip:\  
 # $$CLASSES/jigsaw.zip:$$CLASSES/amaya.zip:$$CLASSES/biss.zip";export CLASSPATH;\  
 #         cd $(THOTDIR)/classes ; $(MAKE) zips)  
   
 tools/mkdep/mkdep :  tools/mkdep/mkdep :
         @(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep)          @(cd tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" mkdep)
   
Line 262  libwww : libwww_config libwww_make Line 256  libwww : libwww_config libwww_make
 #  #
 # Rules to build the redland RDF library  # Rules to build the redland RDF library
 #  #
 redland: force  
         $(MAKE) -C redland  # Previous rule used to link and compile expat inside redland... to be removed
   # after checking all is ok in all the platforms
   # 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")          @($(ECHO) "redland is installed")
   
 #  #
Removed from v.1.125  
changed lines
  Added in v.1.126

Webmaster