Skip to content
Snippets Groups Projects
Commit f0f60f51 authored by Simon Rose's avatar Simon Rose
Browse files

Merge branch 'lower_case_module_names' into 'master'

Use lower case module names

See merge request e3/area/e3-ADSpinnaker!1
parents d0148332 c68dcd1a
No related branches found
No related tags found
1 merge request!1Use lower case module names
......@@ -32,12 +32,12 @@ endif
ifneq ($(strip $(ADCORE_DEP_VERSION)),)
ADCore_VERSION=$(ADCORE_DEP_VERSION)
adcore_VERSION=$(ADCORE_DEP_VERSION)
endif
ifneq ($(strip $(ADGENICAM_DEP_VERSION)),)
ADGenICam_VERSION=$(ADGENICAM_DEP_VERSION)
adgenicam_VERSION=$(ADGENICAM_DEP_VERSION)
endif
......@@ -119,8 +119,8 @@ USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I $(EPICS_BASE)/db
USR_DBFLAGS += -I $(APPDB)
USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/ADCore/$(ADCORE_DEP_VERSION)/db
USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/ADGenICam/$(ADGENICAM_DEP_VERSION)/db
USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adcore/$(ADCORE_DEP_VERSION)/db
USR_DBFLAGS += -I $(E3_SITEMODS_PATH)/adgenicam/$(ADGENICAM_DEP_VERSION)/db
SUBS=$(wildcard $(APPDB)/*.substitutions)
TMPS=$(wildcard $(APPDB)/*.template)
......
......@@ -15,8 +15,8 @@ ADGENICAM_DEP_VERSION:=1.4.0
# In most case, we don't need to touch the following variables.
#
E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
E3_MODULE_SRC_PATH:=ADSpinnaker
E3_MODULE_NAME:=adspinnaker
E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
......
......@@ -2,7 +2,7 @@
EPICS_BASE:=/epics/base-7.0.4
E3_REQUIRE_NAME:=require
E3_REQUIRE_VERSION:=3.2.0
E3_REQUIRE_VERSION:=3.3.0
# The definitions shown below can also be placed in an untracked RELEASE.local
-include $(TOP)/../../RELEASE.local
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment