Changeset 15455

Show
Ignore:
Timestamp:
14.05.2008 16:57:40 (11 years ago)
Author:
mdewsnip
Message:

Fixed up some references to nullproto and recptproto, which are now in the "protocol" directory.

Files:
1 modified

Legend:

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

    r15452 r15455  
    157157COMMONHEADERS = receptionist.h cgiwrapper.h cgiargs.h action.h browserclass.h \ 
    158158                converter.h maincfg.h cgiutils.h recptprototools.h browsetoolsclass.h \ 
    159         statusaction.h pageaction.h recptproto.h \ 
     159        statusaction.h pageaction.h \ 
    160160        pingaction.h queryaction.h documentaction.h  \ 
    161161        extlinkaction.h browseaction.h htmlutils.h argdb.h \ 
     
    169169 
    170170ifeq ($(USE_CORBA), 1) 
    171 LIBRARYHEADERS = nullproto.h z3950proto.h z3950proxy.h corbaproto.h 
    172 else 
    173 LIBRARYHEADERS = nullproto.h z3950proto.h z3950proxy.h 
     171LIBRARYHEADERS = z3950proto.h z3950proxy.h corbaproto.h 
     172else 
     173LIBRARYHEADERS = z3950proto.h z3950proxy.h 
    174174endif 
    175175 
     
    180180                converter.cpp maincfg.cpp cgiutils.cpp recptprototools.cpp browsetoolsclass.cpp \ 
    181181        statusaction.cpp pageaction.cpp \ 
    182         recptproto.cpp pingaction.cpp queryaction.cpp documentaction.cpp \ 
     182        pingaction.cpp queryaction.cpp documentaction.cpp \ 
    183183        extlinkaction.cpp browseaction.h htmlutils.cpp querytools.cpp \ 
    184184        tipaction.cpp authenaction.cpp userdb.cpp usersaction.cpp \ 
     
    198198endif 
    199199 
    200 LIBRARYSOURCES = nullproto.cpp librarymain.cpp $(Z_LIBSOURCES) 
     200LIBRARYSOURCES = librarymain.cpp $(Z_LIBSOURCES) 
    201201 
    202202SOURCES = $(COMMONSOURCES) $(RECPTSOURCES) $(LIBRARYSOURCES) 
     
    213213                converter.o maincfg.o cgiutils.o recptprototools.o browsetoolsclass.o \ 
    214214        statusaction.o pageaction.o \ 
    215         recptproto.o pingaction.o queryaction.o documentaction.o \ 
     215        pingaction.o queryaction.o documentaction.o \ 
    216216        extlinkaction.o browseaction.o htmlutils.o querytools.o browseactiontools.o \ 
    217217        formattools.o tipaction.o authenaction.o argdb.o \ 
     
    233233endif 
    234234 
    235 LIBRARYOBJECTS = nullproto.o librarymain.o $(Z_LIBOBJS) 
     235LIBRARYOBJECTS = librarymain.o $(Z_LIBOBJS) 
    236236 
    237237OBJECTS = $(COMMONOBJECTS) $(RECPTOBJECTS) $(LIBRARYOBJECTS) 
     
    373373# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
    374374 
    375 CORBARECPT_OBJECTS = nullproto.o corbaproto.o corbaclient.o 
     375CORBARECPT_OBJECTS = corbaproto.o corbaclient.o 
    376376 
    377377CORBARECPT_OBJS = $(COMMONOBJECTS) $(CORBARECPT_OBJECTS) $(COLSERVROBJECTS) \