Changeset 22079

Timestamp:

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

• Makefile.in (modified) (1 diff)
• packages/Makefile.in (modified) (2 diffs)
• src/lib/Makefile.in (modified) (2 diffs)

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

@@ -137 +137 @@
       (cd $$subdir && $(MAKE) clean) || exit 1; \
     done
-    if test -e ../bin/java/JDBMWrapper.jar; then \
-      rm ../bin/java/JDBMWrapper.jar; \
-    fi
-    if test -e ../lib/java/jdbm.jar; then \
-      rm ../lib/java/jdbm.jar; \
-    fi
 
 

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

@@ -28 +28 @@
 ifeq ($(USE_GDBM), 1)
 GDBM_DEFINES = -DUSE_GDBM
+GDBM_DIR = gdbm
 else
 GDBM_DEFINES =
+GDBM_DIR =
 endif
 
@@ -57 +59 @@
 # CLEANDIRS is COMPILEDIRS and iconv and expat. Iconv and expat get compiled
 # up during the configure stage itself.
-COMPILEDIRS =   gdbm $(SQLITE_DIR) $(JDBM_DIR) search4j
+COMPILEDIRS =   $(GDBM_DIR) $(SQLITE_DIR) $(JDBM_DIR) search4j
 CLEANDIRS = iconv expat $(COMPILEDIRS)
 

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@