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

main/trunk/greenstone2/common-src/indexers/mg/src/text/Makefile.in

@@ -24 +24 @@
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
- 
+
 SHELL = /bin/sh
 VPATH = @srcdir@
@@ -35 +35 @@
 transform = @program_transform_name@
 
+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@
 CFLAGS = @CFLAGS@ @COMPAT32BITFLAGS@ -fpic
-DEFS = @DEFS@
+DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
 RANLIB = @RANLIB@
 INSTALL = @INSTALL@
@@ -59 +80 @@
 localedir = $(datadir)/locale
 mandir = $(prefix)/man/man1
- 
+
 COMPILE = $(CC) -c $(DEFS) $(TREC_MODE) $(READLINE) $(INCLUDES) $(CFLAGS)
 LINK = $(CC) $(LDFLAGS) -o $@
@@ -67 +88 @@
 .c.o:
     $(COMPILE) $<
- 
+
 
 ANSI2KNR = @ANSI2KNR@
 o = .@U@o
- 
+
 .SUFFIXES: ._c ._o
 .c._c:
@@ -84 +105 @@
     @rm -f _$*.c
     @ln $*._c _$*.c && $(COMPILE) _$*.c && mv _$*.o $@ && rm _$*.c
- 
+
 INCLUDES = -I../../../.. -I../.. -I../../lib -I.
 
@@ -360 +381 @@
 mostlyclean:
     rm -f *$o _*.c _*.o *._c *._o core core.*
- 
+
 clean: mostlyclean
     rm -f $(EXEC) libmgtext.a libmgpass.a
- 
+
 distclean: clean
     rm -f ansi2knr
     rm -f Makefile
- 
+
 maintainer-clean: distclean
     @echo "This command is intended only for maintainers to use;"
     @echo "rebuilding the deleted files may require special tools."
- 
+
 dist: $(DISTFILES)
     for file in $(DISTFILES); do \
@@ -377 +398 @@
       || cp -p $(srcdir)/$$file $(distdir); \
     done
-  
+
 # Tell versions [3.59,3.63) of GNU make not to export all variables.
 # Otherwise a system limit (for SysV at least) may be exc