Changeset 18224 for gsdl/trunk/common-src/src/lib/Makefile.in

Timestamp:

2008-12-17T14:32:32+13:00 (15 years ago)

Author:

mdewsnip

Message:

GRRRR -- fixed up a whole lot more inconsistencies in the Makefiles. These were all perfect before the build-src/common-src/runtime-src split!!

File:

• gsdl/trunk/common-src/src/lib/Makefile.in (modified) (3 diffs)

gsdl/trunk/common-src/src/lib/Makefile.in

@@ -1 +1 @@
 ###########################################################################
 #
-# Makefile -- lib
+# Makefile -- common-src/src/lib
 # A component of the Greenstone digital library software
 # from the New Zealand Digital Library Project at the
@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ../..
-INDEXERS_DIR = $(GSDL_DIR)/indexers
-PACKAGES_DIR = $(GSDL_DIR)/packages
+GSDL_DIR = ../../..
+COMMON_DIR = $(GSDL_DIR)/common-src
+
+INDEXERS_DIR = $(COMMON_DIR)/indexers
+COMMON_PACKAGES_DIR = $(COMMON_DIR)/packages
 
 
 USE_SQLITE = @USE_SQLITE@
 ifeq ($(USE_SQLITE), 1)
-SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/include
+SQLITE_INCLUDES = -I$(COMMON_PACKAGES_DIR)/sqlite/include
 SQLITE_OBJECTS = sqlitedbclass.o
 SQLITE_SOURCES = sqlitedbclass.cpp
@@ -46 +48 @@
 CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
 DEFS = @DEFS@
-INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
+INCLUDES = -I. -I$(GSDL_DIR) -I$(COMMON_PACKAGES_DIR)/gdbm/include -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
 RANLIB = @RANLIB@