Skip to content
Snippets Groups Projects
Commit 13b3b00e authored by Anders Lindh Olsson's avatar Anders Lindh Olsson :8ball:
Browse files

Formatting

parent d9baaacd
No related branches found
No related tags found
1 merge request!85E3-670: Propose linters
Pipeline #111483 failed
#
# Copyright (c) 2004 - 2017 Paul Scherrer Institute # Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2017 - Present European Spallation Source ERIC # Copyright (c) 2017 - Present European Spallation Source ERIC
# #
...@@ -32,9 +31,9 @@ where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) ...@@ -32,9 +31,9 @@ where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
# It is easy to maintain RULES_E3 if we use the "repository" makefile # It is easy to maintain RULES_E3 if we use the "repository" makefile
# instead of the installed makefile. # instead of the installed makefile.
#
include $(where_am_I)/tools/driver.makefile include $(where_am_I)/tools/driver.makefile
BUILDCLASSES += Linux BUILDCLASSES += Linux
APP := . APP := .
...@@ -48,25 +47,24 @@ SOURCES += $(APPSRC)/runScript.c ...@@ -48,25 +47,24 @@ SOURCES += $(APPSRC)/runScript.c
DBDS += $(APPSRC)/runScript.dbd DBDS += $(APPSRC)/runScript.dbd
SOURCES += $(APPSRC)/expr.c SOURCES += $(APPSRC)/expr.c
##
SOURCES += $(APPSRC)/dbLoadTemplate.y SOURCES += $(APPSRC)/dbLoadTemplate.y
DBDS += $(APPSRC)/dbLoadTemplate.dbd DBDS += $(APPSRC)/dbLoadTemplate.dbd
# ESS doesn't have any T2_ppc604 and vxWorks target # ESS doesn't have any T2_ppc604 and vxWorks target
# Friday, May 11 22:05:07 CEST 2018, jhlee # Friday, May 11 22:05:07 CEST 2018, jhlee
# #
#SOURCES_T2 += strdup.c # SOURCES_T2 += strdup.c
#SOURCES_vxWorks += asprintf.c # SOURCES_vxWorks += asprintf.c
# #
#HEADERS += strdup.h # HEADERS += strdup.h
#HEADERS += asprintf.h # HEADERS += asprintf.h
HEADERS += $(APPSRC)/require.h HEADERS += $(APPSRC)/require.h
#HEADERS += require_env.h # HEADERS += require_env.h
# We need to find the Linux link.h before the EPICS link.h # We need to find the Linux link.h before the EPICS link.h
#
USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include
USR_CFLAGS += --std=c99 USR_CFLAGS += --std=c99
...@@ -75,42 +73,37 @@ USR_CFLAGS += --std=c99 ...@@ -75,42 +73,37 @@ USR_CFLAGS += --std=c99
# instead of its name. ESS require can handle them within the EPICS # instead of its name. ESS require can handle them within the EPICS
# IOC shell internally. # IOC shell internally.
# #
#USR_CFLAGS += -DT_A='"${T_A}"' # USR_CFLAGS += -DT_A='"${T_A}"'
# ESS doesn't support WIN32 # ESS doesn't support WIN32
# This should really go into some global WIN32 config file # This should really go into some global WIN32 config file
#
# USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501 # USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
TEMPLATES += $(APPDB)/moduleversion.template TEMPLATES += $(APPDB)/moduleversion.template
#TEMPLATES += moduleversion.db # TEMPLATES += moduleversion.db
vpath dbLoadTemplate_lex.l ../$(APPSRC) vpath dbLoadTemplate_lex.l ../$(APPSRC)
dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
## moduleversion should convert to db instead of template # moduleversion should convert to db instead of template
## So, ESS uses it internally independent upon any IOC # So, ESS uses it internally independent upon any IOC
## varialbes # variables
#
EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH) EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
MSI = $(EPICS_BASE_HOST_BIN)/msi MSI = $(EPICS_BASE_HOST_BIN)/msi
USR_DBFLAGS += -I . -I .. USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I$(EPICS_BASE)/db USR_DBFLAGS += -I$(EPICS_BASE)/db
TMPS = $(wildcard $(APPDB)/*.template) TMPS = $(wildcard $(APPDB)/*.template)
.PHONY: db
db: $(TMPS) db: $(TMPS)
.PHONY: $(TMPS)
$(TMPS): $(TMPS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db" @printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db @rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d @$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d
@$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db $@ @$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db $@
.PHONY: db $(TMPS)
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