Changeset 25233

Timestamp:

2012-03-20T12:21:16+13:00 (12 years ago)

Author:

jmt12

Message:

Adding some variables to the Makefile.in that extensions can override/add to as necessary - this is needed for TDB support

File:

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

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

@@ -69 +69 @@
 endif
 
+# Populated as neccesary by Extention projects
+EXT_INCLUDES =
+EXT_SOURCES  =
+EXT_OBJECTS  =
+EXT_DEFINES  =
+
 AR = ar
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@ @ARCH_DEP_FLAGS@
-DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES)
-INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES)
+DEFS = @DEFS@ $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(EXT_DEFINES)
+INCLUDES = -I. -I$(COMMON_DIR) $(GDBM_INCLUDES) $(SQLITE_INCLUDES) $(EXT_INCLUDES)
 RANLIB = @RANLIB@
 
@@ -105 +111 @@
     $(SQLITE_SOURCES) \
     text_t.cpp \
-    unitool.cpp
+    unitool.cpp \
+    $(EXT_SOURCES)
 
 OBJECTS = \
@@ -126 +133 @@
     $(SQLITE_OBJECTS) \
     text_t.o \
-    unitool.o
+    unitool.o \
+    $(EXT_OBJECTS)
 
 LIBRARY = gsdllib.a