Ignore:
Timestamp:
2010-05-06T21:23:54+12:00 (11 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/packages/Makefile.in

    r21869 r22058  
    2525###########################################################################
    2626
     27USE_GDBM=@USE_GDBM@
     28ifeq ($(USE_GDBM), 1)
     29GDBM_DEFINES = -DUSE_GDBM
     30else
     31GDBM_DEFINES =
     32endif
    2733
    28 ENABLE_JDBM=@ENABLE_JDBM@
    29 
    30 ifeq ($(ENABLE_JDBM), 1)
     34USE_JDBM=@USE_JDBM@
     35ifeq ($(USE_JDBM), 1)
    3136JDBM_DIR = jdbm/jdbm-1.0
     37JDBM_DEFINES = -DUSE_JDBM
    3238else
    33 JDBM_DIR =
     39JDBM_DIR =
     40JDBM_DEFINES =
    3441endif
    3542
    3643USE_SQLITE=@USE_SQLITE@
    37 
    3844ifeq ($(USE_SQLITE), 1)
    3945SQLITE_DIR = sqlite/sqlite-amalgamation-3.6.23.1
     46SQLITE_DEFINES = -DUSE_SQLITE
    4047else
    4148SQLITE_DIR =
     49SQLITE_DEFINES =
    4250endif
     51
     52DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
    4353
    4454# COMPILEDIRS contains the packages that we want to make and install.  It
     
    5666          (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
    5767        done
    58 ifeq ($(ENABLE_JDBM), 1)
     68ifeq ($(USE_JDBM), 1)
    5969# do 'make install' in jdbm directory to get the jar file into the right place
    6070    cd $(JDBM_DIR) && $(MAKE) $(MDEFINES) install
Note: See TracChangeset for help on using the changeset viewer.