Changeset 15471
- Timestamp:
- 2008-05-15T12:05:45+12:00 (16 years ago)
- Location:
- gsdl/trunk/src
- Files:
-
- 2 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/src/corba/Makefile.in
r15463 r15471 90 90 91 91 # =========================================================================================== 92 93 94 # FROM RECPT 95 96 USE_CORBA = @USE_CORBA@ 97 ifeq ($(USE_CORBA), 1) 98 CORBA_CFLAGS=-DUSE_CORBA 99 else 100 CORBA_CFLAGS= 101 endif 102 103 104 ifeq ($(USE_CORBA), 1) 105 EXEC = corbaserver corbarecptldd 106 endif 107 108 109 corbaserver: $(RECPTLIB_OBJS) 110 @echo -e building corbaserver 111 $(MLINK) $(RECPTLIB_OBJS) $(MLIBS) 112 # stripping symbols was a cunning plan, but caused difficulties when 113 # it came to debugging ... 114 # non GNU strips might not like these options - check autoconf? 115 # strip --strip-all --discard-all corbaserver 116 # strip corbaserver 117 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 118 119 CORBARECPT_OBJECTS = corbaproto.o corbaclient.o 120 121 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 122 ../../lib/corbaiface.o \ 123 ../../lib/corbaiface_skel.o \ 124 ../../lib/corbaconv_text_t.o \ 125 ../../lib/corbatext_t.o \ 126 ../../lib/gsdllib.a \ 127 $(INDEXERS_DIR)/mg/src/text/libmgtext.a \ 128 $(INDEXERS_DIR)/mg/lib/libmglib.a \ 129 $(FASTCGI_OBJS) \ 130 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 131 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 132 133 134 corbarecptldd: $(CORBARECPT_OBJS) 135 @echo -e building corbarecptldd: 136 $(MLINK) $(CORBARECPT_OBJS) $(MLIBS) -
gsdl/trunk/src/recpt/Makefile.in
r15455 r15471 32 32 endif 33 33 34 USE_CORBA = @USE_CORBA@35 ifeq ($(USE_CORBA), 1)36 CORBA_CFLAGS=-DUSE_CORBA37 else38 CORBA_CFLAGS=39 endif40 41 34 INDEXERS_DIR=../../indexers 42 35 … … 54 47 CXX = @CXX@ 55 48 56 CXXFLAGS = $(Z_CFLAGS) $( CORBA_CFLAGS) $(AFFLAGS) @CXXFLAGS@49 CXXFLAGS = $(Z_CFLAGS) $(AFFLAGS) @CXXFLAGS@ 57 50 58 51 # YAZ kit for z39.50 … … 120 113 GDBM_OBJS=argdb.o authenaction.o collectoraction.o depositoraction.o wizardaction.o infodbclass.o userdb.o usersaction.o historydb.o librarymain.o nullproto.o queryaction.o z3950proto.o 121 114 122 ifeq ($(USE_CORBA), 1)123 #EXEC = recpt library corbaserver corbarecptldd124 EXEC = library corbaserver corbarecptldd125 else126 #EXEC = recpt library127 115 EXEC = library 128 endif129 116 130 117 ifeq ($(USE_Z3950), 1) … … 168 155 RECEPTHEADERS = 169 156 170 ifeq ($(USE_CORBA), 1)171 LIBRARYHEADERS = z3950proto.h z3950proxy.h corbaproto.h172 else173 157 LIBRARYHEADERS = z3950proto.h z3950proxy.h 174 endif175 158 176 159 HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS) … … 349 332 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 350 333 351 RECPTLIB_OBJECTS = nullproto.o corbaproto.o \ 352 ../../lib/corbatext_t.o ../../lib/corbaconv_text_t.o \ 353 ../../lib/corbaiface.o ../../lib/corbaiface_skel.o 334 RECPTLIB_OBJECTS = nullproto.o 354 335 355 336 RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \ … … 361 342 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 362 343 363 RECPTLIB_OBJS = $(RLIBRARY_OBJS) ../colservr/corbaServer.o 364 365 corbaserver: $(RECPTLIB_OBJS) 366 @echo -e building corbaserver 367 $(MLINK) $(RECPTLIB_OBJS) $(MLIBS) 368 # stripping symbols was a cunning plan, but caused difficulties when 369 # it came to debugging ... 370 # non GNU strips might not like these options - check autoconf? 371 # strip --strip-all --discard-all corbaserver 372 # strip corbaserver 373 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 374 375 CORBARECPT_OBJECTS = corbaproto.o corbaclient.o 376 377 CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \ 378 ../../lib/corbaiface.o \ 379 ../../lib/corbaiface_skel.o \ 380 ../../lib/corbaconv_text_t.o \ 381 ../../lib/corbatext_t.o \ 382 ../../lib/gsdllib.a \ 383 $(INDEXERS_DIR)/mg/src/text/libmgtext.a \ 384 $(INDEXERS_DIR)/mg/lib/libmglib.a \ 385 $(FASTCGI_OBJS) \ 386 $(INDEXERS_DIR)/mgpp/text/libmgpptext.a \ 387 $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a 388 389 390 corbarecptldd: $(CORBARECPT_OBJS) 391 @echo -e building corbarecptldd: 392 $(MLINK) $(CORBARECPT_OBJS) $(MLIBS) 344 RECPTLIB_OBJS = $(RLIBRARY_OBJS) 345 393 346 394 347 test:
Note:
See TracChangeset
for help on using the changeset viewer.