Ignore:
Timestamp:
2010-01-19T16:35:19+13:00 (12 years ago)
Author:
mdewsnip
Message:

Updated Makefiles to link against the Expat library when Lucene is enabled.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/runtime-src/src/oaiservr/Makefile.in

    r21534 r21539  
    6565cgibin_PROGRAMS = oaiserver.cgi$(EXEEXT)
    6666
     67# Option: Lucene support
     68@ENABLE_LUCENE_TRUE@am__append_1 = $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a
     69
    6770# Option: SQLite support
    68 @USE_SQLITE_TRUE@am__append_1 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
     71@USE_SQLITE_TRUE@am__append_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
    6972subdir = src/oaiservr
    7073DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
     
    101104    oaiserver_cgi-rfc1807.$(OBJEXT)
    102105oaiserver_cgi_OBJECTS = $(am_oaiserver_cgi_OBJECTS)
    103 @USE_SQLITE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a
     106@ENABLE_LUCENE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a
     107@USE_SQLITE_TRUE@am__DEPENDENCIES_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a
    104108oaiserver_cgi_DEPENDENCIES =  \
    105109    $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \
    106110    $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \
    107111    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a \
    108     $(am__DEPENDENCIES_1)
     112    $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
    109113DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
    110114depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    252256    $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \
    253257    $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \
    254     $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1)
     258    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1) \
     259    $(am__append_2)
    255260oaiserver_cgi_LDFLAGS = $(COMPAT32BITFLAGS)
    256261all: all-am
Note: See TracChangeset for help on using the changeset viewer.