diff --git a/make_gen b/make_gen index a86c9107..04f0730c 100644 --- a/make_gen +++ b/make_gen @@ -45,7 +45,8 @@ COREOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \ taskobj.o sctcomtask.o multicountersec.o\ lscprot.o secopprot.o secopprot3.o\ messagepipe.o sicsget.o remoteobject.o pmacprot.o charbychar.o binprot.o \ - cnvrt.o tclClock.o tclDate.o tclUnixTime.o stack_trace.o logv2.o outcode.o + cnvrt.o stack_trace.o logv2.o outcode.o \ + tclClock.o tclDate.o tclUnixTime.o MOTOROBJ = motor.o simdriv.o COUNTEROBJ = countdriv.o simcter.o counter.o diff --git a/makefile_rhel7 b/makefile_rhel7 index e3dfcad6..fffcb5ee 100644 --- a/makefile_rhel7 +++ b/makefile_rhel7 @@ -35,8 +35,8 @@ LIBS = -L$(EXTRAROOT)/lib -L$(EXTRAROOT)/lib $(SUBLIBS) $(NILIB) $(EPICSLIBS) $(EXTRAROOT)/lib/libjson-c.a \ -ldl -lz -lmxml $(EXTRAROOT)/lib/libghttp.a -lm -lc -lpthread -lsqlite3 -lbson-1.0 -lmongoc-1.0 SEASUBLIBS = $(SICSROOT)/sicspsi/libseapsi.a -SEALIBS = -L$(EXTRAROOT)/lib -L$(EXTRAROOT)/lib $(SEASUBLIBS) \ - -ltcl \ +SEALIBS = -L$(EXTRAROOT)/lib $(SEASUBLIBS) \ + -L. -ltcl8.5 \ $(EXTRAROOT)/lib/libjson-c.a \ -ldl -lz -lm -lc -lpthread