Commit bc6d664e authored by ahoms's avatar ahoms

* Fixed CBFLib linkage in Makefiles



git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@272 45c4679d-1946-429d-baad-37912b19538b
parent e5a512b4
......@@ -9,7 +9,6 @@ CORE_LDFLAGS := -L../third-party/Processlib/build
CORE_LDLIBS := -lprocesslib
ifneq ($(COMPILE_CBF_SAVING),0)
ct-objs += CtSaving_Cbf.o
CORE_LDFLAGS += -L../third-party/CBFLib/lib
CORE_LDLIBS += -lcbf
endif
......@@ -19,7 +18,7 @@ ifneq ($(COMPILE_CORE),0)
name := core
core-objs := ../common/src/Common.o \
../hardware/src/Hw.o \
../control/src/Ct.o
../control/src/Ct.o
version-file := ../common/VERSION
core-flags := $(CORE_LDFLAGS)
core-deps := $(CORE_LDLIBS)
......
......@@ -9,7 +9,11 @@ include ../../../common/espia/include/espia.inc
LDFLAGS = -pthread -L$(ESPIA_DRV_LIB)
LDLIBS = -lespia
HWINTER_LDFLAGS = -L../../../../third-party/Processlib/build -lprocesslib
HWINTER_LDFLAGS = $(LDFLAGS) \
-L../../../../third-party/Processlib/build \
-L../../../../third-party/CBFLib/lib
HWINTER_LDLIBS = $(LDLIBS) -lprocesslib -lcbf
CXXFLAGS = -I../include \
-I../../../../hardware/include -I../../../../common/include \
......@@ -24,7 +28,7 @@ testfocla: testfocla.o $(focla-objs)
$(CXX) $(LDFLAGS) -o $@ $+ $(LDLIBS)
testfoclahwinterface: testfoclahwinterface.o $(focla-objs) $(ct-objs)
$(CXX) $(LDFLAGS) $(HWINTER_LDFLAGS) -o $@ $+ $(LDLIBS)
$(CXX) $(HWINTER_LDFLAGS) -o $@ $+ $(HWINTER_LDLIBS)
clean:
rm -f *.o testfocla testfoclahwinterface
......
......@@ -8,8 +8,10 @@ SRCS = testfrelon.cpp testfreloninterface.cpp testfrelonspectroscopy.cpp \
include ../../common/espia/include/espia.inc
LDFLAGS = -pthread -L$(ESPIA_DRV_LIB) -L../../../third-party/Processlib/build
LDLIBS = -lespia -lprocesslib
LDFLAGS = -pthread -L$(ESPIA_DRV_LIB) \
-L../../../third-party/Processlib/build \
-L../../../third-party/CBFLib/lib
LDLIBS = -lespia -lprocesslib -lcbf
CXXFLAGS = -I../include -I../../common/espia/include \
-I../../../hardware/include -I../../../common/include \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment