From ff600558b5554303394584cc5608190ad0423dbd Mon Sep 17 00:00:00 2001 From: chatty Date: Tue, 28 Nov 2000 17:07:44 +0000 Subject: Big reorganisation --- comm/Imakefile | 124 ++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 75 insertions(+), 49 deletions(-) (limited to 'comm/Imakefile') diff --git a/comm/Imakefile b/comm/Imakefile index ff04443..0b218fc 100644 --- a/comm/Imakefile +++ b/comm/Imakefile @@ -2,8 +2,8 @@ # The Unix Channel # # by Michel Beaudouin-Lafon and Stephane Chatty -# -# Copyright 1990-1996 +# +# Copyright 1990-1997 # Laboratoire de Recherche en Informatique (LRI) # Centre d'Etudes de la navigation Aerienne # @@ -13,54 +13,55 @@ # $CurLog$ # - CXXFLAGS = $(CXXOPTIONS) -I. -I$(LOCINCL) -DUNIX_SOCK + CXXFLAGS = $(CXXOPTIONS) -g -I. -I$(LOCINCL) -DUNIX_SOCK cc = $(CXXSUFFIX) - SRC = error.$(cc) IOS.$(cc) MsgBuffer.$(cc) Message.$(cc) Channel.$(cc) \ - TimeOut.$(cc) SignalHandler.$(cc) Multiplexer.$(cc) Address.$(cc) \ - Socket.$(cc) Datagram.$(cc) Stream.$(cc) MsgStream.$(cc) dgram.$(cc) \ - Event.$(cc) Server.$(cc) Service.$(cc) Agent.$(cc) \ - TextStream.$(cc) TextServer.$(cc) \ - PortServer.$(cc) PortServerReq.$(cc) + SRC = error.$(cc) IOS.$(cc) MsgBuffer.$(cc) Message.$(cc) \ + Channel.$(cc) TimeOut.$(cc) SignalHandler.$(cc) \ + Multiplexer.$(cc) Address.$(cc) \ + Socket.$(cc) Datagram.$(cc) Stream.$(cc) \ + BufStream.$(cc) MsgStream.$(cc) BusAccess.$(cc) HDR = error.h IOS.h MsgBuffer.h Message.h Channel.h \ TimeOut.h SignalHandler.h Multiplexer.h \ - Address.h Socket.h Datagram.h Stream.h MsgStream.h dgram.h \ - Event.h Server.h Service.h Agent.h TextStream.h TextServer.h PortServer.h - + Address.h Socket.h Datagram.h Stream.h \ + BufStream.h MsgStream.h BusAccess.h TextStream.h UCHOBJ = error.o IOS.o MsgBuffer.o Message.o Channel.o \ TimeOut.o SignalHandler.o Multiplexer.o \ - Address.o Socket.o Datagram.o Stream.o MsgStream.o dgram.o \ - Event.o Server.o Service.o Agent.o \ - TextStream.o TextServer.o \ - PortServer.o PortServerReq.o + Address.o Socket.o Datagram.o Stream.o \ + BufStream.o MsgStream.o BusAccess.o TextStream.o CHANOBJ = error.o IOS.o MsgBuffer.o Message.o Channel.o \ - Multiplexer.o TimeOut.o SignalHandler.o + Multiplexer.o TimeOut.o SignalHandler.o UCHHDR = version.h \ - $(LOCINCL)/ccu/SmartPointer.h $(LOCINCL)/ccu/List.h \ + $(LOCINCL)/ccu/List.h $(LOCINCL)/ccu/HashTable.h \ $(LOCINCL)/ccu/bool.h \ $(LOCINCL)/ccu/word.h $(LOCINCL)/ccu/IdTable.h \ $(LOCINCL)/ccu/String.h \ $(LOCINCL)/ccu/Signal.h \ $(LOCINCL)/ccu/Time.h $(LOCINCL)/ccu/Timer.h\ - global.h error.h IOS.h MsgBuffer.h Message.h \ + $(LOCINCL)/ccu/Initializer.h \ + $(LOCINCL)/dnn/Event.h \ + $(LOCINCL)/dnn/Loop.h \ + error.h IOS.h MsgBuffer.h Message.h \ Channel.h Multiplexer.h TimeOut.h SignalHandler.h \ - Address.h Socket.h Datagram.h Stream.h MsgStream.h dgram.h \ - Event.h Server.h Service.h Agent.h TextStream.h TextServer.h PortServer.h + Address.h Socket.h Datagram.h Stream.h \ + BufStream.h MsgStream.h BusAccess.h TextStream.h CHANHDR = version.h \ $(LOCINCL)/ccu/bool.h \ $(LOCINCL)/ccu/word.h \ - $(LOCINCL)/ccu/SmartPointer.h $(LOCINCL)/ccu/List.h \ + $(LOCINCL)/ccu/List.h \ $(LOCINCL)/ccu/Signal.h \ $(LOCINCL)/ccu/Time.h $(LOCINCL)/ccu/Timer.h \ - global.h error.h IOS.h MsgBuffer.h Message.h \ + $(LOCINCL)/ccu/Initializer.h \ + $(LOCINCL)/dnn/Loop.h \ + error.h IOS.h MsgBuffer.h Message.h \ Channel.h Multiplexer.h - LLIB = $(LOCLIB)/libCcu.a + LLIB = -L$(LOCLIB) -lUch -lDnn_g -lCcu LEX = lex YACC = yacc # or bison -y @@ -70,42 +71,67 @@ CxxRule () -# default target is 'chan' or 'chan comm' -all : UchTarget - -comm : $(LOCLIB)/libUch.a $(LOCBIN)/portserv $(LOCBIN)/porttest \ - $(LOCBIN)/reqgen $(LOCBIN)/tellagent $(LOCINCL)/uch.h +# UchTarget is 'chan' or 'chan comm' +all : headers UchTarget + +headers: incldir \ + $(LOCINCL)/uch/IOS.h \ + $(LOCINCL)/uch/Channel.h \ + $(LOCINCL)/uch/Multiplexer.h \ + $(LOCINCL)/uch/TimeOut.h \ + $(LOCINCL)/uch/SignalHandler.h \ + $(LOCINCL)/uch/Address.h \ + $(LOCINCL)/uch/Socket.h \ + $(LOCINCL)/uch/Datagram.h \ + $(LOCINCL)/uch/Stream.h \ + $(LOCINCL)/uch/MsgBuffer.h \ + $(LOCINCL)/uch/BufStream.h \ + $(LOCINCL)/uch/Message.h \ + $(LOCINCL)/uch/MsgStream.h \ + $(LOCINCL)/uch/BusAccess.h \ + $(LOCINCL)/uch/TextStream.h + +comm : $(LOCLIB)/libUch.a \ + $(LOCINCL)/uch.h chan : $(LOCLIB)/libChan.a $(LOCINCL)/chan.h -local : libUch.a libChan.a uch.h chan.h portserv porttest reqgen tellagent +local : libUch.a libChan.a uch.h chan.h LibraryTarget (Uch, $(UCHOBJ)) LibraryTarget (Chan, $(CHANOBJ)) -YaccTarget (ReqMgr,ReqMgr.yacc,Uch_) -LexTarget (ReqMgr,ReqMgr.lex,Uch_) -ReqMgr.lex.o: ReqMgr.lex.cc ReqMgr.yacc.h - -ProgramTarget (portserv, portserv.o, libUch.a) -ProgramTarget (porttest, porttest.o, libUch.a) -ProgramTarget (tellagent, tellagent.o, libUch.a) -ProgramTarget (test, test.o, libUch.a) -ProgramTarget (reqgen, reqgen.o ReqMgr.o ReqMgr.yacc.o ReqMgr.lex.o, ) - GenHeaderTarget (uch.h, $(UCHHDR)) GenHeaderTarget (chan.h, $(CHANHDR)) -InstallLibsTarget ($(LOCLIB),Uch) -InstallLibsTarget ($(LOCLIB),Chan) - -InstallTarget ($(LOCINCL)/uch.h, uch.h) -InstallTarget ($(LOCINCL)/chan.h, chan.h) -InstallProgramTarget ($(LOCBIN)/portserv, portserv) -InstallProgramTarget ($(LOCBIN)/porttest, porttest) -InstallProgramTarget ($(LOCBIN)/tellagent, tellagent) -InstallProgramTarget ($(LOCBIN)/reqgen, reqgen) +InstallLibsTarget($(LOCLIB),Uch) +InstallLibsTarget($(LOCLIB),Chan) + +incldir: + -mkdir $(LOCINCL)/uch + +InstallTarget($(LOCINCL)/uch.h, uch.h) +InstallTarget($(LOCINCL)/chan.h, chan.h) +InstallTarget ($(LOCINCL)/uch/IOS.h, IOS.h) +InstallTarget ($(LOCINCL)/uch/Channel.h, Channel.h) +InstallTarget ($(LOCINCL)/uch/Multiplexer.h, Multiplexer.h) +InstallTarget ($(LOCINCL)/uch/TimeOut.h, TimeOut.h) +InstallTarget ($(LOCINCL)/uch/SignalHandler.h, SignalHandler.h) +InstallTarget ($(LOCINCL)/uch/Address.h, Address.h) +InstallTarget ($(LOCINCL)/uch/Socket.h, Socket.h) +InstallTarget ($(LOCINCL)/uch/Datagram.h, Datagram.h) +InstallTarget ($(LOCINCL)/uch/Stream.h, Stream.h) +InstallTarget ($(LOCINCL)/uch/MsgBuffer.h, MsgBuffer.h) +InstallTarget ($(LOCINCL)/uch/BufStream.h, BufStream.h) +InstallTarget ($(LOCINCL)/uch/Message.h, Message.h) +InstallTarget ($(LOCINCL)/uch/MsgStream.h, MsgStream.h) +InstallTarget ($(LOCINCL)/uch/BusAccess.h, BusAccess.h) +InstallTarget ($(LOCINCL)/uch/TextStream.h, TextStream.h) DocRule ("The Unix Channel") TeXRule () DistrDocRule (UCH) + +ProgramTarget (testbus, testbus.o,); + + -- cgit v1.1