Changeset 21539 for main/trunk/gs2-core/runtime-src/src/oaiservr

Timestamp:

2010-01-19T16:35:19+13:00 (14 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/oaiservr

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (3 diffs)

main/trunk/gs2-core/runtime-src/src/oaiservr/Makefile.am

@@ -73 +73 @@
 oaiserver_cgi_LDFLAGS = $(COMPAT32BITFLAGS)
 
+# Option: Lucene support
+if ENABLE_LUCENE
+  oaiserver_cgi_LDADD += $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a
+endif
+
 # Option: SQLite support
 if USE_SQLITE

main/trunk/gs2-core/runtime-src/src/oaiservr/Makefile.in

@@ -65 +65 @@
 cgibin_PROGRAMS = oaiserver.cgi$(EXEEXT)
 
+# Option: Lucene support
+@ENABLE_LUCENE_TRUE@am__append_1 = $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a
+
 # Option: SQLite support
-@USE_SQLITE_TRUE@am__append_1 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
+@USE_SQLITE_TRUE@am__append_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a -ldl -lpthread
 subdir = src/oaiservr
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -101 +104 @@
     oaiserver_cgi-rfc1807.$(OBJEXT)
 oaiserver_cgi_OBJECTS = $(am_oaiserver_cgi_OBJECTS)
-@USE_SQLITE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a
+@ENABLE_LUCENE_TRUE@am__DEPENDENCIES_1 = $(GSDL_DIR)/common-src/packages/expat/lib/libexpat.a
+@USE_SQLITE_TRUE@am__DEPENDENCIES_2 = $(GSDL_DIR)/common-src/packages/sqlite/lib/libsqlite3.a
 oaiserver_cgi_DEPENDENCIES =  \
     $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \
     $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \
     $(GSDL_DIR)/common-src/src/lib/libgsdllib.a \
-    $(am__DEPENDENCIES_1)
+    $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -252 +256 @@
     $(GSDL_DIR)/runtime-src/src/protocol/libgsdlprotocol.a \
     $(GSDL_DIR)/runtime-src/src/colservr/libgsdlcolservr.a \
-    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1)
+    $(GSDL_DIR)/common-src/src/lib/libgsdllib.a $(am__append_1) \
+    $(am__append_2)
 oaiserver_cgi_LDFLAGS = $(COMPAT32BITFLAGS)
 all: all-am