Changeset 15551 for gsdl/trunk/src


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
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r15546 r15551  
    3232AR = ar
    3333CC = @CC@
    34 CPP = @CXX@
    35 CFLAGS = @CFLAGS@
    36 CPPFLAGS = @CXXFLAGS@
     34CXX = @CXX@
     35CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
     36CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3737DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER
    3838# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    … …  
    4545
    4646COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES)
    47 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
     47CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
    4848
    4949
    … …  
    5555.SUFFIXES: .cpp .o
    5656.cpp.o:
    57     $(CPPCOMPILE) $<
     57    $(CXXCOMPILE) $<
    5858
    5959
    … …  
    133133
    134134depend:
    135     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     135    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

  • 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

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

    r15546 r15551  
    4040endif
    4141
     42CC = @CC@
     43CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@
    4244
    43 CPP = @CXX@
    44 CPPFLAGS = @CXXFLAGS@
     45CXX = @CXX@
     46CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    4547INCLUDES = -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) -I$(INDEXERS_DIR)/mgpp/text
    46 LDFLAGS = @LDFLAGS@
     48LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    4749LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS)
    4850INSTALL = @INSTALL@
    4951
    5052
    51 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(INCLUDES)
    52 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     53CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(INCLUDES)
     54CXXLINK = $(CXX) $(LDFLAGS) -o $@
    5355
    5456
    … …  
    5658.SUFFIXES: .cpp .o
    5759.cpp.o:
    58     $(CPPCOMPILE) -o $@ $<
     60    $(CXXCOMPILE) -o $@ $<
    5961
    6062
    … …  
    121123
    122124oaiserver: $(EXECUTABLE_OBJECTS)
    123     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     125    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    124126
    125127all: $(EXECUTABLE)
    … …  
    135137
    136138depend:
    137     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     139    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)

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

    r15546 r15551  
    6363
    6464
    65 CPP = @CXX@
    66 CPPFLAGS = @CXXFLAGS@
     65CC = @CC@
     66CFLAGS=@CFLAGS@ @COMPAT32BITFLAGS@
     67CXX = @CXX@
     68CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    6769DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DHAVE_CONFIG_H $(FASTCGI_DEFS) $(Z3950_DEFS)
    6870INCLUDES = @GDBM_INCLUDE@ -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    … …  
    7072        -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
    7173INSTALL = @INSTALL@
    72 LDFLAGS = @LDFLAGS@
     74LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    7375LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
    7476    $(FASTCGI_LIBS) $(Z3950_LIBS)
    7577
    7678
    77 CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)
    78 CPPLINK = $(CPP) $(LDFLAGS) -o $@
     79CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
     80CXXLINK = $(CXX) $(LDFLAGS) -o $@
    7981
    8082
    … …  
    8284.SUFFIXES: .cpp .o
    8385.cpp.o:
    84     $(CPPCOMPILE) $<
     86    $(CXXCOMPILE) $<
    8587
    8688
    … …  
    190192
    191193library: $(EXECUTABLE_OBJECTS)
    192     $(CPPLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
     194    $(CXXLINK) $(EXECUTABLE_OBJECTS) $(LIBS)
    193195
    194196all: $(EXECUTABLE)
    … …  
    204206
    205207depend:
    206     makedepend -Y -- $(DEFS) $(INCLUDES) $(CPPFLAGS) -- $(SOURCES)
     208    makedepend -Y -- $(DEFS) $(INCLUDES) $(CXXFLAGS) -- $(SOURCES)
Note: See TracChangeset for help on using the changeset viewer.