Changeset 15495

Show
Ignore:
Timestamp:
15.05.2008 14:53:39 (11 years ago)
Author:
mdewsnip
Message:

Updated to include everything required by the "library" executable when Z39.50 support is compiled in.

Location:
gsdl/trunk/src/z3950
Files:
5 added
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/src/z3950/Makefile.in

    r15492 r15495  
    3131 
    3232 
     33USE_Z3950 = @USE_Z3950@ 
     34ifeq ($(USE_Z3950), 1) 
     35Z3950_INCLUDES = -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/include -I$(GSDL_DIR)/packages/yaz/yaz-2.1.4/client 
     36else 
     37Z3950_INCLUDES =  
     38endif 
     39 
     40 
    3341AR = ar 
     42CC = @CC@ 
    3443CPP = @CXX@ 
     44CFLAGS = @CFLAGS@ 
    3545CPPFLAGS = @CXXFLAGS@ 
    3646DEFS = @DEFS@ -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DGSDLSERVER 
    3747# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
    38 INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) -I$(INDEXERS_DIR)/mgpp/text 
     48INCLUDES = -I. -I$(GSDL_DIR) -I$(GSDL_DIR)/lib -I$(COLSERVR_DIR) -I$(PROTOCOL_DIR) \ 
     49    -I$(INDEXERS_DIR)/mgpp/text $(Z3950_INCLUDES) 
    3950RANLIB = @RANLIB@ 
    4051 
    4152 
     53COMPILE = $(CC) -c $(CFLAGS) $(DEFS) $(INCLUDES) 
    4254CPPCOMPILE = $(CPP) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
    43 CPPLINK = $(CPP) $(LDFLAGS) -o $@ 
    4455 
    4556 
    4657.SUFFIXES: 
     58.SUFFIXES: .c .o 
     59.c.o: 
     60    $(COMPILE) $< 
     61 
    4762.SUFFIXES: .cpp .o 
    4863.cpp.o: 
     
    5166 
    5267SOURCES = \ 
     68    yaz_zclient.c \ 
    5369    z3950proto.cpp \ 
    54     z3950proxy.cpp 
     70    z3950proxy.cpp \ 
     71    zparse.tab.c \ 
     72    zparse.yy.c 
    5573 
    5674OBJECTS = \ 
     75    yaz_zclient.o \ 
    5776    z3950proto.o \ 
    58     z3950proxy.o  
     77    z3950proxy.o \ 
     78    zparse.tab.o \ 
     79    zparse.yy.o 
    5980 
    6081LIBRARY = gsdlz3950.a