Changeset 22079 for main/trunk/greenstone2/common-src/src

Timestamp:

2010-05-12T20:37:02+12:00 (14 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.

File:

• main/trunk/greenstone2/common-src/src/lib/Makefile.in (modified) (2 diffs)

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

@@ -49 +49 @@
 GDBM_SOURCES = gdbmclass.cpp
 GDBM_OBJECTS = gdbmclass.o
+GDBM_INCLUDES = -I$(COMMON_PACKAGES_DIR)/gdbm/include
 GDBM_DEFINES = -DUSE_GDBM
 else
 GDBM_SOURCES = 
-GDBM_OBJECTS = 
+GDBM_OBJECTS =
+GDBM_INCLUDES = 
 GDBM_DEFINES =
 endif
@@ -71 +73 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
-INCLUDES = -I. -I$(COMMON_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include $(SQLITE_INCLUDES)
+INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@