Changeset 15471


Ignore:
Timestamp:
2008-05-15T12:05:45+12:00 (16 years ago)
Author:
mdewsnip
Message:

Moved all the CORBA stuff in src/recpt into src/corba, because it really uglies up the core source code, Makefiles etc.

Location:
gsdl/trunk/src
Files:
2 edited
3 moved

Legend:

Unmodified
Added
Removed

  • gsdl/trunk/src/corba/Makefile.in

    r15463 r15471  
    9090
    9191# ===========================================================================================
     92
     93
     94# FROM RECPT
     95
     96USE_CORBA = @USE_CORBA@
     97ifeq ($(USE_CORBA), 1)
     98CORBA_CFLAGS=-DUSE_CORBA
     99else
     100CORBA_CFLAGS=
     101endif
     102
     103
     104ifeq ($(USE_CORBA), 1)
     105EXEC = corbaserver corbarecptldd
     106endif
     107
     108
     109corbaserver: $(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
     119CORBARECPT_OBJECTS = corbaproto.o corbaclient.o
     120
     121CORBARECPT_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
     134corbarecptldd: $(CORBARECPT_OBJS)
     135    @echo -e building corbarecptldd:
     136    $(MLINK)  $(CORBARECPT_OBJS)  $(MLIBS)

  • gsdl/trunk/src/recpt/Makefile.in

    r15455 r15471  
    3232endif
    3333
    34 USE_CORBA = @USE_CORBA@
    35 ifeq ($(USE_CORBA), 1)
    36 CORBA_CFLAGS=-DUSE_CORBA
    37 else
    38 CORBA_CFLAGS=
    39 endif
    40 
    4134INDEXERS_DIR=../../indexers
    4235
    … …  
    5447CXX = @CXX@
    5548
    56 CXXFLAGS = $(Z_CFLAGS) $(CORBA_CFLAGS) $(AFFLAGS) @CXXFLAGS@
     49CXXFLAGS = $(Z_CFLAGS) $(AFFLAGS) @CXXFLAGS@
    5750
    5851# YAZ kit for z39.50
    … …  
    120113GDBM_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
    121114
    122 ifeq ($(USE_CORBA), 1)
    123 #EXEC = recpt library corbaserver corbarecptldd
    124 EXEC = library corbaserver corbarecptldd
    125 else
    126 #EXEC = recpt library
    127115EXEC = library
    128 endif
    129116
    130117ifeq ($(USE_Z3950), 1)
    … …  
    168155RECEPTHEADERS =
    169156
    170 ifeq ($(USE_CORBA), 1)
    171 LIBRARYHEADERS = z3950proto.h z3950proxy.h corbaproto.h
    172 else
    173157LIBRARYHEADERS = z3950proto.h z3950proxy.h
    174 endif
    175158
    176159HEADERS = $(COMMONHEADERS) $(RECPTHEADERS) $(LIBRARYHEADERS)
    … …  
    349332# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
    350333
    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
     334RECPTLIB_OBJECTS = nullproto.o
    354335
    355336RLIBRARY_OBJS = $(COMMONOBJECTS) $(RECPTLIB_OBJECTS) $(COLSERVROBJECTS) \
    … …  
    361342    $(INDEXERS_DIR)/mgpp/lib/libmgpplib.a
    362343
    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)
     344RECPTLIB_OBJS = $(RLIBRARY_OBJS)
     345
    393346
    394347test:
Note: See TracChangeset for help on using the changeset viewer.