Changeset 15552


Ignore:
Timestamp:
2008-05-17T13:37:16+12:00 (16 years ago)
Author:
davidb
Message:

Introduction of COMPAT32BITFLAGS to confirugre and Makefile.in files to help compile Greenstone on a 64-bit machine

Location:
gsdl/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/lib/Makefile.in

    r15546 r15552  
    3131
    3232AR = ar
    33 CPP = @CXX@
    34 CPPFLAGS = @CXXFLAGS@
     33CXX = @CXX@
     34CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3535DEFS = @DEFS@
    3636INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib
    … …  
    3838
    3939
    40 CPPCOMPILE = $(CPP) -c $(CCFLAGS) $(DEFS) $(INCLUDES)
     40CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    4141
    4242
    … …  
    4444.SUFFIXES: .cpp .o
    4545.cpp.o:
    46     $(CPPCOMPILE) $<
     46    $(CXXCOMPILE) $<
    4747
    4848
    … …  
    102102
    103103depend:
    104     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     104    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

  • gsdl/trunk/src/hashfile/Makefile.in

    r2998 r15552  
    2929 
    3030AR = ar
     31CC = @CC@
     32CFLAGS = @CFLAGS@
    3133CXX = @CXX@
    3234CXXFLAGS = @CXXFLAGS@
    … …  
    3941INSTALL = @INSTALL@
    4042 
    41 COMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     43COMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4244LINK = $(CXX) $(LDFLAGS) -o $@
    4345 
    … …  
    7375
    7476depend:
    75     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     77    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
    7678
    7779
Note: See TracChangeset for help on using the changeset viewer.