Diff for /Amaya/thotlib/Makefile.in between versions 1.64 and 1.65

version 1.64, 2003/11/18 08:10:24 version 1.65, 2003/11/19 10:02:09
Line 32  OBJDIRS = base content dialogue document Line 32  OBJDIRS = base content dialogue document
 # Rule to build standard objects  # Rule to build standard objects
 #  #
 .c.o :  .c.o :
         $(CC) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -c $< -o $@          $(CXX) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -c $< -o $@
   
 #  #
 # Rule to build c++ files  # Rule to build c++ files
Line 44  OBJDIRS = base content dialogue document Line 44  OBJDIRS = base content dialogue document
 # Rule to build specific objects for libThotKernel.a  # Rule to build specific objects for libThotKernel.a
 #  #
 .cND.o :  .cND.o :
         $(CC) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -DNODISPLAY -c $< -o $@          $(CXX) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -DNODISPLAY -c $< -o $@
   
 all : directories libThotKernel.a libThotEditor.a  all : directories libThotKernel.a libThotEditor.a
   
Line 63  directories : Line 63  directories :
 force :  force :
   
 ../tablelib/libThotTable.a : force  ../tablelib/libThotTable.a : force
         @(cd ../tablelib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libThotTable)          @(cd ../tablelib ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" libThotTable)
   
 ../amaya/libCSS.a : force  ../amaya/libCSS.a : force
         @(cd ../amaya ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" libCSS)          @(cd ../amaya ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"  CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" libCSS)
   
 include .depends  include .depends
   
 ../tools/mkdep/mkdep :   ../tools/mkdep/mkdep : 
         @(cd ../tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)")          @(cd ../tools/mkdep ; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" )
   
 .depends depend : ../tools/mkdep/mkdep  .depends depend : ../tools/mkdep/mkdep
         ../tools/mkdep/mkdep -relative -vpath $(VPATH) $(INCLUDES) $(VPATH)/*/*.c  > .depends          ../tools/mkdep/mkdep -relative -vpath $(VPATH) $(INCLUDES) $(VPATH)/*/*.c  > .depends
Line 260  EDITOR_OBJ = \ Line 260  EDITOR_OBJ = \
         view/glbox.o          view/glbox.o
   
 base/registry.o : @srcdir@/base/registry.c  base/registry.o : @srcdir@/base/registry.c
         $(CC) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) \          $(CXX) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) \
            -DCOMPILED_IN_THOTDIR=\"@top_srcdir@\" \             -DCOMPILED_IN_THOTDIR=\"@top_srcdir@\" \
            -DCOMPILED_IN_THOTDIR2=\"@prefix@/thot\" \             -DCOMPILED_IN_THOTDIR2=\"@prefix@/thot\" \
            -DNODISPLAY \             -DNODISPLAY \
Line 293  PRINT_OBJ= \ Line 293  PRINT_OBJ= \
         editing/print.o          editing/print.o
   
 tree/paginatePP.o : @srcdir@/tree/paginate.c @srcdir@/include/thot_sys.h  tree/paginatePP.o : @srcdir@/tree/paginate.c @srcdir@/include/thot_sys.h
         $(CC) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -DPAGINEETIMPRIME -c @srcdir@/tree/paginate.c -o $@          $(CXX) $(CXXFLAGS) $(THOT_OPTIONS) $(INCLUDES) -DPAGINEETIMPRIME -c @srcdir@/tree/paginate.c -o $@
   
 print : ../bin ../bin/print  print : ../bin ../bin/print
   
Line 302  print : ../bin ../bin/print Line 302  print : ../bin ../bin/print
   
 ../bin/print : $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../tablelib/libThotTable.a \  ../bin/print : $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../tablelib/libThotTable.a \
         ../amaya/libCSS.a          ../amaya/libCSS.a
         $(CC) $(LDFLAGS) -o $@ $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../amaya/libCSS.a -lThotTable $(LIBS)          $(CXX) $(LDFLAGS) -o $@ $(THOTK_OBJ) $(DISPLAY_OBJ) $(PRINT_OBJ) ../amaya/libCSS.a -lThotTable $(LIBS)
         @$(ECHO) "====>" print is done          @$(ECHO) "====>" print is done
   
 CEXTRACT= ../bin/cextract  CEXTRACT= ../bin/cextract

Removed from v.1.64  
changed lines
  Added in v.1.65


Webmaster