Changeset 2171
- Timestamp:
- 2001-03-13T18:02:15+13:00 (23 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsdl/src/recpt/Makefile.in
r2166 r2171 32 32 endif 33 33 34 USE_CORBA = @USE_CORBA@ 35 ifeq ($(USE_CORBA), 1) 36 CORBA_CFLAGS=-DUSE_CORBA 37 else 38 CORBA_CFLAGS= 39 endif 40 41 42 34 43 AR = ar 35 44 CC = @CC@ … … 37 46 #CCFLAGS = @CFLAGS@ -Wall -Wunused -pedantic -W -Woverloaded-virtual 38 47 39 CCFLAGS = $(Z_CFLAGS) @CFLAGS@48 CCFLAGS = $(Z_CFLAGS) $(CORBA_CFLAGS) @CFLAGS@ 40 49 41 50 # YAZ kit for z39.50 … … 50 59 else 51 60 DEFS = -DNZDL -DQUIET -DSHORT_SUFFIX -DPARADOCNUM -DUSE_FASTCGI @DEFS@ 52 53 61 INCLUDES = -I../../lib -I. -I../colservr -I../../packages/mg \ 54 62 -I../../packages/mg/lib -I../../packages/mg/src/text \ … … 69 77 MINCLUDES = -I. -I../../lib -I../colservr $(MICO_INC) 70 78 71 USE_CORBA = @USE_CORBA@72 73 79 RANLIB = @RANLIB@ 74 80 LDFLAGS = @LDFLAGS@ … … 76 82 77 83 GSDLOS = @gsdlos@ 78 79 84 80 85 COMPILE = $(CC) -c $(CCFLAGS) $(DEFS) $(INCLUDES) … … 214 219 # called by librarymain.cpp. 215 220 $(YAZDIR)/client/yaz_zclient.o: $(YAZDIR)/lib/libyaz.a 216 cd $(YAZDIR)/client && makeyaz_zclient.o221 cd $(YAZDIR)/client && $(MAKE) yaz_zclient.o 217 222 218 223 # this should be done by the top level makefile... 219 224 $(YAZDIR)/lib/libyaz.a: 220 cd $(YAZDIR) && makeall225 cd $(YAZDIR) && $(MAKE) all 221 226 222 227 # put a separate rule here, as it speeds up compilation of other objects … … 252 257 253 258 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 254 255 256 ifneq ($(USE_FASTCGI), 1) 259 ifeq ($(USE_FASTCGI), 1) 260 FASTCGI_OBJS = ../../packages/fcgi/libfcgi/libfcgi.a 261 else 262 FASTCGI_OBJS = 263 endif 264 257 265 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \ 258 266 ../../lib/gsdllib.a \ 259 267 ../../packages/mg/src/text/libtextin.a \ 260 268 ../../packages/mg/lib/libmg.a \ 269 $(FASTCGI_OBJS) \ 261 270 ../mgpp/text/libtextin.a \ 262 271 ../mgpp/lib/libmg.a 263 else264 RECPT_OBJS = $(COMMONOBJECTS) $(RECPTOBJECTS) \265 ../../lib/gsdllib.a \266 ../../packages/mg/src/text/libtextin.a \267 ../../packages/mg/lib/libmg.a \268 ../../packages/fcgi/libfcgi/libfcgi.a \269 ../mgpp/text/libtextin.a \270 ../mgpp/lib/libmg.a271 endif272 272 273 273 recpt: $(RECPT_OBJS) … … 282 282 283 283 284 ifneq ($(USE_FASTCGI), 1)285 284 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \ 286 285 ../../lib/gsdllib.a \ 287 286 ../../packages/mg/src/text/libtextin.a \ 288 287 ../../packages/mg/lib/libmg.a \ 289 $( Z_LIBYAZ_A) \288 $(FASTCGI_OBJS) $(Z_LIBYAZ_A) \ 290 289 ../mgpp/text/libtextin.a \ 291 ../mgpp/lib/libmg.a 292 else 293 LIBRARY_OBJS = $(COMMONOBJECTS) $(LIBRARYOBJECTS) $(COLSERVROBJECTS) \ 294 ../../lib/gsdllib.a \ 295 ../../packages/mg/src/text/libtextin.a \ 296 ../../packages/mg/lib/libmg.a \ 297 ../../packages/fcgi/libfcgi/libfcgi.a \ 298 ../mgpp/text/libtextin.a \ 299 ../mgpp/lib/libmg.a \ 300 $(Z_LIBYAZ_A) 301 endif 290 ../mgpp/lib/libmg.a 302 291 303 292 library: $(LIBRARY_OBJS) … … 309 298 ../../lib/corbatext_t.o ../../lib/corbaconv_text_t.o \ 310 299 ../../lib/corbaiface.o ../../lib/corbaiface_skel.o 311 ifneq ($(USE_FASTCGI), 1) 300 312 301 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \ 313 302 ../../lib/gsdllib.a \ 314 303 ../../packages/mg/src/text/libtextin.a \ 315 304 ../../packages/mg/lib/libmg.a \ 305 $(FASTCGI_OBJS) $(Z_LIBOBJS) $(Z_LIBYAZ_A) \ 316 306 ../mgpp/text/libtextin.a \ 317 307 ../mgpp/lib/libmg.a 318 else 319 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \ 320 ../../lib/gsdllib.a \ 321 ../../packages/mg/src/text/libtextin.a \ 322 ../../packages/mg/lib/libmg.a \ 323 ../../packages/fcgi/libfcgi/libfcgi.a \ 324 ../mgpp/text/libtextin.a \ 325 ../mgpp/lib/libmg.a 326 endif 308 327 309 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o 328 310 329 311 corbaserver: $(RECPTLIB_OBJS) 330 echo -e building corbaserver312 @echo -e building corbaserver 331 313 $(MLINK) $(RECPTLIB_OBJS) $(MLIBS) 332 strip --strip-all --discard-all corbaserver 333 314 # non GNU strips might not like these options - check autoconf? 315 # strip --strip-all --discard-all corbaserver 316 strip corbaserver 334 317 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 335 318 336 319 CORBARECPT_OBJECTS = nullproto.o corbaproto.o corbaclient.o 337 ifneq ($(USE_FASTCGI), 1) 320 338 321 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 339 322 ../../lib/corbaiface.o \ … … 344 327 ../../packages/mg/src/text/libtextin.a \ 345 328 ../../packages/mg/lib/libmg.a \ 329 $(FASTCGI_OBJS) \ 346 330 ../mgpp/text/libtextin.a \ 347 331 ../mgpp/lib/libmg.a 348 else 349 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 350 ../../lib/corbaiface.o \ 351 ../../lib/corbaiface_skel.o\ 352 ../../lib/corbaconv_text_t.o \ 353 ../../lib/corbatext_t.o \ 354 ../../lib/gsdllib.a \ 355 ../../packages/mg/src/text/libtextin.a \ 356 ../../packages/mg/lib/libmg.a \ 357 ../../packages/fcgi/libfcgi/libfcgi.a \ 358 ../mgpp/text/libtextin.a \ 359 ../mgpp/lib/libmg.a 360 endif 332 361 333 362 334 corbarecptldd: $(CORBARECPT_OBJS) 363 echo -e building corbarecptldd:335 @echo -e building corbarecptldd: 364 336 $(MLINK) $(CORBARECPT_OBJS) $(MLIBS) 365 337
Note:
See TracChangeset
for help on using the changeset viewer.