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

Diff for /Amaya/Makefile.in between versions 1.104 and 1.105

version 1.104, 2004/08/16 11:25:58 version 1.105, 2004/10/01 14:12:27
Line 19  LIBPNG    = libpng Line 19  LIBPNG    = libpng
   
 #MKP: adding davlib  #MKP: adding davlib
 SUBDIRS = @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@  SUBDIRS = @SUBDIRS@ tools thotlib batch drawlib indexlib annotlib amaya thot @DAVDIR@
 EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW)  EXTRA_SUBDIRS= misc pluginlib $(LIBRAPTOR) $(REDLAND) $(LIBWWW) $(WX_BUILDDIR) $(GL_BUILDDIR)
   
 prefix = @prefix@  prefix = @prefix@
 exec_prefix = @exec_prefix@  exec_prefix = @exec_prefix@
Line 28  bindir = @bindir@ Line 28  bindir = @bindir@
   
 srcdir  = $(THOTDIR)  srcdir  = $(THOTDIR)
   
   default : tools wxwidgets thotlib batch amaya_prog @PRINTIFNOTGL@
 default : tools thotlib batch amaya_prog @PRINTIFNOTGL@  
   
 amaya : amaya_prog tools thotlib @PRINTIFNOTGL@  amaya : amaya_prog tools thotlib @PRINTIFNOTGL@
   
Line 56  amaya_prog: rebuild force bin/str Line 55  amaya_prog: rebuild force bin/str
         @(if test -d amaya ; then cd amaya ; \          @(if test -d amaya ; then cd amaya ; \
           $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi)            $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" amaya ; fi)
   
   wxwidgets: rebuild force
           @(if test -d "$(WX_BUILDDIR)" ; then cd $(WX_BUILDDIR) ; \
             $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" ; fi)
   
 @NOPRINT@print_prog: rebuild force bin/str  @NOPRINT@print_prog: rebuild force bin/str
 @NOPRINT@       @(if test -d thotlib ; then cd thotlib ; \  @NOPRINT@       @(if test -d thotlib ; then cd thotlib ; \
 @NOPRINT@         $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)  @NOPRINT@         $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" print ; fi)
Line 395  libz libz.a : force Line 398  libz libz.a : force
         @($(RM) $(THOTDIR)/libpng/libz/*.o)          @($(RM) $(THOTDIR)/libpng/libz/*.o)
         @(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")          @(cd libpng/zlib ; $(MAKE) CC="$(CC)" CFLAGS="-O -x c")
   
   
 #  #
 # This section try to maintain the Makefile(s) up-to-date in  # This section try to maintain the Makefile(s) up-to-date in
 # case the autoconf sources are modified.  # case the autoconf sources are modified.
Removed from v.1.104  
changed lines
  Added in v.1.105

Webmaster