Changeset 10178
- Timestamp:
- 2005-06-27T15:33:04+12:00 (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/Makefile.in
r10143 r10178 120 120 endif 121 121 122 ifeq ($(USE_Z3950), 1) 123 EXEC = $(EXEC) z3950server 124 endif 125 122 126 all: $(EXEC) 123 127 … … 178 182 179 183 ifeq ($(USE_Z3950), 1) 180 Z_LIBSOURCES=z3950proto.cpp z3950proxy.cpp zparse.tab.c parse.yy.c $(YAZDIR)/client/yaz_zclient.c184 Z_LIBSOURCES=z3950proto.cpp z3950proxy.cpp yaz_zclient.c zparse.tab.c parse.yy.c $(YAZDIR)/yaz-2.1.4/client/tabcomplete.c 181 185 else 182 186 Z_LIBSOURCES= … … 211 215 212 216 ifeq ($(USE_Z3950), 1) 213 Z_LIBOBJS=z3950proto.o z3950proxy.o zparse.tab.o $(YAZDIR)/client/yaz_zclient.o 217 Z_LIBOBJS=z3950proto.o z3950proxy.o yaz_zclient.o zparse.tab.o 218 Z_CLIENTOBJS=$(YAZDIR)/yaz-2.1.4/client/tabcomplete.o 214 219 else 215 220 Z_LIBOBJS= 221 Z_CLIENTOBJS= 216 222 endif 217 223 … … 248 254 # Note! If USE_FASTCGI=1, yaz is still compiled and linked, but never 249 255 # called by librarymain.cpp. 250 $(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/lib/libyaz.a 251 cd $(YAZDIR)/client && $(MAKE) yaz_zclient.o256 yaz_zclient.o: yaz_zclient.c 257 $(COMPILE) -I$(YAZDIR)/include -I$(YAZDIR)/yaz-2.1.4/client $< 252 258 253 259 # this should be done by the top level makefile... 254 260 $(YAZDIR)/lib/libyaz.a: 255 cd $(YAZDIR) && $(MAKE)all261 cd $(YAZDIR)/src && $(MAKE) && $(MAKE) install 256 262 257 263 # put a separate rule here, as it speeds up compilation of other objects … … 312 318 313 319 314 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \320 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) $(Z_CLIENTOBJS) \ 315 321 ../../lib/gsdllib.a \ 316 322 ../../packages/mg/src/text/libtextin.a \ … … 379 385 $(FASTCGI_OBJS) \ 380 386 ../mgpp/text/libtextin.a \ 381 ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a 387 ../mgpp/lib/libmg.a ../../packages/yaz/lib/libyaz.a ../../packages/d2m/libd2m.a 388 382 389 383 390 z3950server: $(Z3950_OBJS)
Note:
See TracChangeset
for help on using the changeset viewer.