Changeset 21539

Show
Ignore:
Timestamp:
19.01.2010 16:35:19 (9 years ago)
Author:
mdewsnip
Message:

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

Location:
main/trunk/gs2-core/runtime-src/src
Files:
4 modified

Legend:

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

    r21502 r21539  
    7373oaiserver_cgi_LDFLAGS = $(COMPAT32BITFLAGS) 
    7474 
     75# Option: Lucene support 
     76if ENABLE_LUCENE 
     77  oaiserver_cgi_LDADD += $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a 
     78endif 
     79 
    7580# Option: SQLite support 
    7681if USE_SQLITE 
  • 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 
  • main/trunk/gs2-core/runtime-src/src/recpt/Makefile.am

    r21491 r21539  
    9595library_cgi_LDFLAGS = $(COMPAT32BITFLAGS) 
    9696 
     97# Option: Lucene support 
     98if ENABLE_LUCENE 
     99  library_cgi_LDADD += $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a 
     100endif 
     101 
    97102# Option: SQLite support 
    98103if USE_SQLITE 
  • main/trunk/gs2-core/runtime-src/src/recpt/Makefile.in

    r21534 r21539  
    6565cgibin_PROGRAMS = library.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/recpt 
    7073DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
     
    120123    library_cgi-wizardaction.$(OBJEXT) 
    121124library_cgi_OBJECTS = $(am_library_cgi_OBJECTS) 
    122 @USE_SQLITE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a 
     125@ENABLE_LUCENE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a 
     126@USE_SQLITE_TRUE@am__DEPENDENCIES_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a 
    123127library_cgi_DEPENDENCIES =  \ 
    124128    $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \ 
    125129    $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \ 
    126130    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a \ 
    127     $(am__DEPENDENCIES_1) 
     131    $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) 
    128132DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    129133depcomp = $(SHELL) $(top_srcdir)/depcomp 
     
    293297    $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \ 
    294298    $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \ 
    295     $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1) 
     299    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1) \ 
     300    $(am__append_2) 
    296301library_cgi_LDFLAGS = $(COMPAT32BITFLAGS) 
    297302all: all-am