Ignore:
Timestamp:
2008-05-17T10:01:24+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/src/gdbmedit
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/gdbmedit/db2txt/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS= -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
     
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
     
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182
     
    8586
    8687db2txt: $(DB2TXT_OBJS) $(DPLIBS)
    87     $(CPPLINK) $(DB2TXT_OBJS) $(LIBS)
     88    $(CXXLINK) $(DB2TXT_OBJS) $(LIBS)
  • gsdl/trunk/src/gdbmedit/gdbmget/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
     
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
     
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  • gsdl/trunk/src/gdbmedit/gdbmset/Makefile.in

    r15230 r15551  
    3030AR = ar
    3131CC = @CC@
    32 CPP = @CXX@
    33 CCFLAGS = -Wall @CFLAGS@
     32CXX = @CXX@
     33CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     34CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3435DEFS = @DEFS@
    3536RANLIB = @RANLIB@
    3637INCLUDES = -I../../lib @GDBM_INCLUDE@
    37 LDFLAGS = @LDFLAGS@
     38LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3839DPLIBS =
    3940LIBS = @GDBM_LIBPATH@ -lgdbm @LIBS@
     
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546LINK = $(CC) $(LDFLAGS) -o $@
    46 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     47CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4748 
    4849.SUFFIXES:
     
    5354.SUFFIXES: .cpp .o
    5455.cpp.o:
    55     $(CPPCOMPILE) $<
     56    $(CXXCOMPILE) $<
    5657 
    5758
     
    7778
    7879depend:
    79     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     80    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8081
    8182# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
  • gsdl/trunk/src/gdbmedit/txt2db/Makefile.in

    r15230 r15551  
    2929AR = ar
    3030CC = @CC@
    31 CPP = @CXX@
    32 CCFLAGS = -Wall @CFLAGS@
     31CXX = @CXX@
     32CFLAGS = -Wall @CFLAGS@ @COMPAT32BITFLAGS@
     33CXXFLAGS = -Wall @CXXFLAGS@ @COMPAT32BITFLAGS@
    3334DEFS = @DEFS@
    3435RANLIB = @RANLIB@
    3536INCLUDES = -I../../../lib @GDBM_INCLUDE@
    36 LDFLAGS = @LDFLAGS@
     37LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    3738INDEXERS_DIR=../../../indexers
    3839DPLIBS = ../../../lib/gsdllib.a $(INDEXERS_DIR)/mg/lib/unitool.o
     
    4142INSTALL = @INSTALL@
    4243 
    43 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
    44 CPPCOMPILE = $(CPP) -c $(DEFS) $(INCLUDES) $(CCFLAGS)
     44COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
     45CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
    4546MCOMPILE = ../../../bin/linux/mico-c++ $(MCFLAGS) $(DEFS) $(MINCLUDES) -c
    4647LINK = $(CC) $(LDFLAGS) -o $@
    4748MLINK = ../../../bin/linux/mico-ld $(LDFLAGS) -lmico2.2.7 -o $@
    48 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     49CXXLINK = $(CXX) $(LDFLAGS) -o $@
    4950 
    5051.SUFFIXES:
     
    5556.SUFFIXES: .cpp .o
    5657.cpp.o:
    57     $(CPPCOMPILE) $<
     58    $(CXXCOMPILE) $<
    5859 
    5960.SUFFIXES: .mpp .o
     
    8283
    8384depend:
    84     makedepend -Y -- $(DEFS) $(INCLUDES) $(CCFLAGS) -- $(SOURCES)
     85    makedepend -Y -- $(DEFS) $(INCLUDES) $(CFLAGS) -- $(SOURCES)
    8586
    8687
     
    9091
    9192txt2db: $(TXT2DB_OBJS) $(DPLIBS)
    92     $(CPPLINK) $(TXT2DB_OBJS) $(LIBS)
     93    $(CXXLINK) $(TXT2DB_OBJS) $(LIBS)
    9394
    9495
Note: See TracChangeset for help on using the changeset viewer.