diff --git a/src/libCom/Makefile.Host b/src/libCom/Makefile.Host index 89e63affa..686157a03 100644 --- a/src/libCom/Makefile.Host +++ b/src/libCom/Makefile.Host @@ -29,7 +29,11 @@ INC += osiTime.h INC += osiTimer.h INC += macLib.h INC += impLib.h +<<<<<<< Makefile.Host +INC += sigPipeIgnore.h +======= INC += dbmf.h +>>>>>>> 1.4 # For WIN32 we supply getopt as part of libCom: INC_WIN32 := getopt.h @@ -65,7 +69,11 @@ LIBSRCS += macUtil.c LIBSRCS += ipAddrToA.cc LIBSRCS += osdTime.cc LIBSRCS += impLib.c +<<<<<<< Makefile.Host +LIBSRCS += sigPipeIgnore.c +======= LIBSRCS += dbmf.c +>>>>>>> 1.4 # WIN32 has no getopt, we add it to the Com lib, # special initialisation is done in winmain.c diff --git a/src/libCom/Makefile.Vx b/src/libCom/Makefile.Vx index 80a9ae074..ddf2577ad 100644 --- a/src/libCom/Makefile.Vx +++ b/src/libCom/Makefile.Vx @@ -29,6 +29,7 @@ SRCS.c += ../macUtil.c #SRCS.c += ../osiTimer.cc #SRCS.c += ../os/vxWorks/osdTime.cc SRCS.c += ../os/vxWorks/ipAddrToA.c +SRCS.c += ../os/vxWorks/sigPipeIgnore.c SRCS.c += ../impLib.c SRCS.c += ../dbmf.c @@ -54,6 +55,7 @@ LIBOBJS += macUtil.o #LIBOBJS += osiTimer.o #LIBOBJS += osdTime.o LIBOBJS += ipAddrToA.o +LIBOBJS += sigPipeIgnore.o LIBOBJS += impLib.o LIBOBJS += dbmf.o