Commit 41a4f385 authored by ahoms's avatar ahoms

* using consistent repository ESPIA_DRV_LIB path (instead of blissadm)


git-svn-id: https://scm.blissgarden.org/svn/lima/trunk@160 45c4679d-1946-429d-baad-37912b19538b
parent 6ae44e0a
......@@ -5,16 +5,9 @@ lima-objs := ../common/src/Common.o \
../camera/common/espia/src/Espia.o \
../camera/frelon/src/Frelon.o
OS := $(shell /csadmin/common/scripts/get_os.share)
ifeq ($(OS),redhate5)
ARCH := $(shell /csadmin/common/scripts/get_esrflinux --architecture)
else
ARCH :=
endif
LDFLAGS += -L../third-party/Processlib/build \
-L /users/blissadm/driver/$(OS)/lib/$(ARCH)
include ../camera/common/espia/include/espia.inc
LDFLAGS += -L../third-party/Processlib/build -L$(ESPIA_DRV_LIB)
LDLIBS += -lprocesslib -lespia
src: liblima.so
......
CS_SCRIPTS = /csadmin/common/scripts
OS = $(shell $(CS_SCRIPTS)/get_os.share)
ESRF_VER = $(shell $(CS_SCRIPTS)/get_esrflinux)
ESRF_MAJ_VER = $(shell echo $(ESRF_VER) | cut -c1-4)
ARCH = $(shell $(CS_SCRIPTS)/get_esrflinux --architecture)
BLISS_DRV_BASE = /segfs/bliss/source/driver
ESRF_COMP_BASE = $(BLISS_DRV_BASE)/linux-2.6/compile/$(ESRF_MAJ_VER)
ifndef ESPIA_DRV_BASE
ifeq ($(OS), suse82)
ARCH = x86
ESPIA_DRV_BASE = $(BLISS_DRV_BASE)/linux/espia/rel
else # OS != suse82
ESRF_VER = $(shell $(CS_SCRIPTS)/get_esrflinux)
ESRF_MAJ_VER = $(shell echo $(ESRF_VER) | cut -c1-4)
ESRF_COMP_BASE = $(BLISS_DRV_BASE)/linux-2.6/compile/$(ESRF_MAJ_VER)
ARCH = $(shell $(CS_SCRIPTS)/get_esrflinux --architecture)
ifneq ($(OS), redhate5)
ESPIA_DRV_BASE = $(error Invalid ESRF/Linux version: $(ESRF_VER))
else # OS == redhate5
......@@ -28,5 +29,5 @@ ESPIA_DRV_INCL = $(ESPIA_DRV_BASE)/src
endif
ifndef ESPIA_DRV_LIB
ESPIA_DRV_LIB = $(ESPIA_DRV_BASE)/src
ESPIA_DRV_LIB = $(ESPIA_DRV_BASE)/lib/$(ARCH)
endif
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