Changeset 22058 for main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

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.

File:

• main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/oaiservr/Makefile.in

@@ -62 +62 @@
 endif
 
+USE_GDBM = @USE_GDBM@
+ifeq ($(USE_GDBM), 1)
+GDBM_DEFINES = -DUSE_GDBM
+else
+GDBM_DEFINES = 
+endif
+
+USE_JDBM = @USE_JDBM@
+ifeq ($(USE_JDBM), 1)
+JDBM_DEFINES = -DUSE_JDBM
+else
+JDBM_DEFINES = 
+endif
 
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
+SQLITE_DEFINES = -DUSE_SQLITE
 SQLITE_LIBS = $(COMMON_PACKAGES_DIR)/sqlite/lib/libsqlite3.a -ldl -lpthread
 else
 SQLITE_LIBS = 
+SQLITE_DEFINES =
 endif
 
@@ -75 +90 @@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
+DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 INCLUDES = -I$(COMMON_DIR)/src/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(RECPT_DIR) $(MGPP_INCLUDES)
 LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
@@ -82 +98 @@
 
 
-CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(INCLUDES)
+CXXCOMPILE = $(CXX) -c $(CXXFLAGS) $(DEFS) $(INCLUDES)
 CXXLINK = $(CXX) $(LDFLAGS) -o $@