Changeset 22058 for main/trunk/greenstone2/common-src/indexers/mgpp/lib/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/common-src/indexers/mgpp/lib/Makefile.in (modified) (8 diffs)

main/trunk/greenstone2/common-src/indexers/mgpp/lib/Makefile.in

@@ -25 +25 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
- 
+
 SHELL = /bin/sh
 srcdir = @srcdir@
 subdir = lib
 VPATH = @srcdir@
- 
+
+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
+else
+SQLITE_DEFINES =
+endif
+
 AR = ar
 CC = @CC@
@@ -40 +61 @@
 endif
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@ -fPIC
-DEFS = @DEFS@
+DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 RANLIB = @RANLIB@
 
@@ -48 +69 @@
 datadir = $(prefix)/share
 localedir = $(datadir)/locale
- 
+
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES)  $(CFLAGS)
 CXXCOMPILE = $(CXX) -c $(DEFS) $(INCLUDES) $(CXXFLAGS)
- 
+
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -63 +84 @@
 ANSI2KNR = @ANSI2KNR@
 o = .@U@o
- 
+
 .SUFFIXES: ._c ._o
 .c._c:
@@ -78 +99 @@
 
 INCLUDES = -I.. -I$(srcdir)
- 
+
 HEADERS = \
     bitio_m_random.h   local_strings.h    lovinstem.h \
@@ -128 +149 @@
 maninstall:
 manuninstall:
- 
+
 dist: $(DISTFILES)
     for file in $(DISTFILES); do \
@@ -137 +158 @@
 mostlyclean:
     rm -f *.o *_.o
- 
+
 clean: mostlyclean
     rm -f libmgpplib.a
- 
+
 distclean: clean
     rm -f Makefile
- 
+
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"
@@ -151 +172 @@
 #Makefile: Makefile.in ../../../config.status
 #   cd ../../.. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.