Changeset 15599


Ignore:
Timestamp:
2008-05-20T15:34:17+12:00 (16 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) Added a stub sqliteclass that will be filled in soon.

Location:
gsdl/trunk
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/lib/Makefile.in

    r15580 r15599  
    3030
    3131
     32USE_SQLITE = @USE_SQLITE@
     33ifeq ($(USE_SQLITE), 1)
     34SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/sqlite3/linux/include
     35SQLITE_OBJECTS = sqliteclass.o
     36SQLITE_SOURCES = sqliteclass.cpp
     37else
     38SQLITE_INCLUDES =
     39SQLITE_OBJECTS =
     40SQLITE_SOURCES =
     41endif
     42
     43
    3244AR = ar
    3345CXX = @CXX@
    3446CXXFLAGS = @CXXFLAGS@ @COMPAT32BITFLAGS@
    3547DEFS = @DEFS@
    36 INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib
     48INCLUDES = @GDBM_INCLUDE@ -I$(GSDL_DIR) -I$(INDEXERS_DIR)/mg/lib $(SQLITE_INCLUDES)
    3749RANLIB = @RANLIB@
    3850
    … …  
    6375    OIDtools.cpp \
    6476    phrases.cpp \
    65     text_t.cpp
     77    text_t.cpp \
     78    $(SQLITE_SOURCES)
    6679
    6780OBJECTS = \
    … …  
    8194    OIDtools.o \
    8295    phrases.o \
    83     text_t.o
     96    text_t.o \
     97    $(SQLITE_OBJECTS)
    8498
    8599LIBRARY = gsdllib.a

  • gsdl/trunk/src/recpt/Makefile.in

    r15579 r15599  
    4949FASTCGI_INCLUDES =
    5050FASTCGI_LIBS =
     51endif
     52
     53USE_SQLITE = @USE_SQLITE@
     54ifeq ($(USE_SQLITE), 1)
     55SQLITE_INCLUDES = -I$(PACKAGES_DIR)/sqlite/sqlite3/linux/include
     56SQLITE_LIBS = $(PACKAGES_DIR)/sqlite/sqlite3/linux/lib/libsqlite3.a
     57else
     58SQLITE_INCLUDES =
     59SQLITE_LIBS =
    5160endif
    5261
    … …  
    7281        -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \
    7382    -I$(INDEXERS_DIR)/mg -I$(INDEXERS_DIR)/mg/lib -I$(INDEXERS_DIR)/mgpp/text \
    74         -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(Z3950_INCLUDES)
     83        -I$(PACKAGES_DIR)/expat/include $(FASTCGI_INCLUDES) $(SQLITE_INCLUDES) $(Z3950_INCLUDES)
    7584INSTALL = @INSTALL@
    7685LDFLAGS = @LDFLAGS@ @COMPAT32BITFLAGS@
    7786LIBS = @LIBS@ @GDBM_LIBPATH@ -lgdbm -L$(PACKAGES_DIR)/expat/lib -lexpat $(ACCENTFOLD_LIBS) \
    78     $(FASTCGI_LIBS) $(Z3950_LIBS)
     87    $(FASTCGI_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)
    7988RANLIB = @RANLIB@
    8089
Note: See TracChangeset for help on using the changeset viewer.