Changeset 30948 for main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

Timestamp:

2016-10-26T17:25:27+13:00 (8 years ago)

Author:

ak19

Message:

Changes in z3950 and recpt Makefile to get dependencies right for libyaz (now these library dependencies are taken directly from yaz's Makefile with a GNU makefile specific shell command). These changes are ahead of committing a somewhat newer version of yaz itself (from 2007).

File:

• main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

@@ -133 +133 @@
 Z3950_DEFS = -DUSE_Z3950
 Z3950_INCLUDES = -I$(Z3950_DIR)
-Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a
+# Use GNU specific shell command to capture output.
+# Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile)
+# http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable
+YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//')
+Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(YAZ_LIBS)
 else
 Z3950_DEFS =