Changeset 22079

Show
Ignore:
Timestamp:
12.05.2010 20:37:02 (9 years ago)
Author:
ak19
Message:

1. Missing conditional LIBS or INCLUDES or DIR declaration for when USE_GDBM is switched on. Previously it used to always put these in the includes/libs, not it only does so on USE_GDBM.

Location:
main/trunk/greenstone2/common-src
Files:
3 modified

Legend:

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

    r22067 r22079  
    137137      (cd $$subdir && $(MAKE) clean) || exit 1; \ 
    138138    done 
    139     if test -e ../bin/java/JDBMWrapper.jar; then \ 
    140       rm ../bin/java/JDBMWrapper.jar; \ 
    141     fi 
    142     if test -e ../lib/java/jdbm.jar; then \ 
    143       rm ../lib/java/jdbm.jar; \ 
    144     fi 
    145139 
    146140 
  • main/trunk/greenstone2/common-src/packages/Makefile.in

    r22058 r22079  
    2828ifeq ($(USE_GDBM), 1) 
    2929GDBM_DEFINES = -DUSE_GDBM 
     30GDBM_DIR = gdbm 
    3031else 
    3132GDBM_DEFINES = 
     33GDBM_DIR = 
    3234endif 
    3335 
     
    5759# CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled 
    5860# up during the configure stage itself. 
    59 COMPILEDIRS =   gdbm $(SQLITE_DIR) $(JDBM_DIR) search4j 
     61COMPILEDIRS =   $(GDBM_DIR) $(SQLITE_DIR) $(JDBM_DIR) search4j 
    6062CLEANDIRS = iconv expat $(COMPILEDIRS) 
    6163 
  • main/trunk/greenstone2/common-src/src/lib/Makefile.in

    r22058 r22079  
    4949GDBM_SOURCES = gdbmclass.cpp 
    5050GDBM_OBJECTS = gdbmclass.o 
     51GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include 
    5152GDBM_DEFINES = -DUSE_GDBM 
    5253else 
    5354GDBM_SOURCES =  
    54 GDBM_OBJECTS =  
     55GDBM_OBJECTS = 
     56GDBM_INCLUDES =  
    5557GDBM_DEFINES = 
    5658endif 
     
    7173CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ 
    7274DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) 
    73 INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include $(SQLITE_INCLUDES) 
     75INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 
    7476RANLIB = @RANLIB@ 
    7577