Changeset 30948

Show
Ignore:
Timestamp:
26.10.2016 17:25:27 (3 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).

Location:
main/trunk/greenstone2/runtime-src/src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r30878 r30948  
    133133Z3950_DEFS = -DUSE_Z3950 
    134134Z3950_INCLUDES = -I$(Z3950_DIR) 
    135 Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a 
     135# Use GNU specific shell command to capture output. 
     136# Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 
     137# http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable 
     138YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//') 
     139Z3950_LIBS = $(Z3950_DIR)/gsdlz3950.a $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(YAZ_LIBS) 
    136140else 
    137141Z3950_DEFS = 
  • main/trunk/greenstone2/runtime-src/src/z3950/Makefile.in

    r30920 r30948  
    109109INSTALL = @INSTALL@ 
    110110LDFLAGS = @LDFLAGS@ 
     111# Use GNU specific shell command to capture output. 
     112# Need LIBS to contain all the dependencies for libyaz that yaz had worked out (from yaz's Makefile) 
     113# http://stackoverflow.com/questions/2019989/how-to-assign-the-output-of-a-command-to-a-makefile-variable 
     114YAZ_LIBS = $(shell egrep "^LIBS\s?=" $(RUNTIME_PACKAGES_DIR)/yaz/yaz-2.1.4/Makefile | sed 's/^LIBS\s\?=\s\?//') 
    111115LIBS = @LIBS@ $(GDBM_LIBS) -L$(COMMON_PACKAGES_DIR)/expat/lib -lexpat \ 
    112116    $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) \ 
    113     $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a -lxml2 -lz 
     117    $(RUNTIME_PACKAGES_DIR)/yaz/lib/libyaz.a $(RUNTIME_PACKAGES_DIR)/d2m/libd2m.a $(YAZ_LIBS) -lz 
    114118RANLIB = @RANLIB@ 
    115119