Ignore:
Timestamp:
2010-05-06T21:23:54+12:00 (14 years ago)
Author:
ak19
Message:

Changes to makefiles to 1. incorporate USE_GDBM and USE_JDBM flags (and USE_SQLITE) in most places so that the DEFINES variable is set at all times. This is necessary to ensure that all classes that contain objects with gdbm and jdbm members are of a consistent size. Else we've had experience with Greenstone crashing with memory errors (to do with the similar ENABLE_indexer flags). 2. ENABLE_JDBM is now USE_JDBM. 3. Not everything works now. It still compiles the default way, but the disable-gdbm flag is causing trouble when compiling argdb in recpt since it uses that.

Location:
main/trunk/greenstone2/common-src/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone2/common-src/src/gdbmedit/db2txt/Makefile.in

    r18224 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmdel/Makefile.in

    r18442 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmget/Makefile.in

    r18224 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmkeys/Makefile.in

    r18442 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/gdbmedit/gdbmset/Makefile.in

    r18224 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/gdbmedit/txt2db/Makefile.in

    r21325 r22058  
    3030COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
    3131
     32USE_GDBM = @USE_GDBM@
     33ifeq ($(USE_GDBM), 1)
     34GDBM_DEFINES = -DUSE_GDBM
     35else
     36GDBM_DEFINES =
     37endif
     38
     39USE_JDBM = @USE_JDBM@
     40ifeq ($(USE_JDBM), 1)
     41JDBM_DEFINES = -DUSE_JDBM
     42else
     43JDBM_DEFINES =
     44endif
     45
     46USE_SQLITE = @USE_SQLITE@
     47ifeq ($(USE_SQLITE), 1)
     48SQLITE_DEFINES = -DUSE_SQLITE
     49else
     50SQLITE_DEFINES =
     51endif
    3252
    3353CXX = @CXX@
    3454CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    35 DEFS = @DEFS@
     55DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    3656GSDLOS = @gsdlos@
    3757INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(COMMON_DIR)/src/lib

  • main/trunk/greenstone2/common-src/src/lib/Makefile.in

    r22043 r22058  
    3535ifeq ($(USE_SQLITE), 1)
    3636SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include
     37SQLITE_SOURCES = sqlitedbclass.cpp
    3738SQLITE_OBJECTS = sqlitedbclass.o
    38 SQLITE_SOURCES = sqlitedbclass.cpp
     39SQLITE_DEFINES = -DUSE_SQLITE
    3940else
    4041SQLITE_INCLUDES =
     42SQLITE_SOURCES =
    4143SQLITE_OBJECTS =
    42 SQLITE_SOURCES =
     44SQLITE_DEFINES =
    4345endif
    4446
    45 ENABLE_JDBM=@ENABLE_JDBM@
    46 ifeq ($(ENABLE_JDBM), 1)
     47USE_GDBM=@USE_GDBM@
     48ifeq ($(USE_GDBM), 1)
     49GDBM_SOURCES = gdbmclass.cpp
     50GDBM_OBJECTS = gdbmclass.o
     51GDBM_DEFINES = -DUSE_GDBM
     52else
     53GDBM_SOURCES =
     54GDBM_OBJECTS =
     55GDBM_DEFINES =
     56endif
     57
     58USE_JDBM=@USE_JDBM@
     59ifeq ($(USE_JDBM), 1)
    4760JDBM_SOURCES = jdbmnaiveclass.cpp
    4861JDBM_OBJECTS = jdbmnaiveclass.o
     62JDBM_DEFINES = -DUSE_JDBM
    4963else
    5064JDBM_SOURCES =
    5165JDBM_OBJECTS =
     66JDBM_DEFINES =
    5267endif
    5368
    … …  
    5570CXX = @CXX@
    5671CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    57 DEFS = @DEFS@
     72DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    5873INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include $(SQLITE_INCLUDES)
    5974RANLIB = @RANLIB@
    … …  
    7691    display.cpp \
    7792    fileutil.cpp \
    78     gdbmclass.cpp \
     93    $(GDBM_SOURCES) \
    7994    $(JDBM_SOURCES) \
    8095    gsdlsitecfg.cpp \
    … …  
    86101    OIDtools.cpp \
    87102    phrases.cpp \
     103    sqldbclass.cpp \
     104    $(SQLITE_SOURCES) \
    88105    text_t.cpp \
    89     unitool.cpp \
    90     sqldbclass.cpp \
    91     $(SQLITE_SOURCES)
     106    unitool.cpp
    92107
    93108OBJECTS = \
    … …  
    98113    display.o \
    99114    fileutil.o \
    100     gdbmclass.o \
     115    $(GDBM_OBJECTS) \
    101116    $(JDBM_OBJECTS) \
    102117    gsdlsitecfg.o \
    … …  
    108123    OIDtools.o \
    109124    phrases.o \
     125    sqldbclass.o \
     126    $(SQLITE_OBJECTS) \
    110127    text_t.o \
    111     unitool.o \
    112     sqldbclass.o \
    113     $(SQLITE_OBJECTS)
     128    unitool.o
    114129
    115130LIBRARY = gsdllib.a
Note: See TracChangeset for help on using the changeset viewer.