From 13b3b00eccd2effaad9fd5006bb3920343c8f6dd Mon Sep 17 00:00:00 2001
From: Anders Lindh Olsson <anders.lindholsson@ess.eu>
Date: Wed, 20 Apr 2022 14:37:10 +0200
Subject: [PATCH] Formatting
---
require.Makefile | 39 ++++++++++++++++-----------------------
1 file changed, 16 insertions(+), 23 deletions(-)
diff --git a/require.Makefile b/require.Makefile
index 4ecb628b..8ff3fb58 100644
--- a/require.Makefile
+++ b/require.Makefile
@@ -1,4 +1,3 @@
-#
# Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2017 - Present European Spallation Source ERIC
#
@@ -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
# instead of the installed makefile.
+#
include $(where_am_I)/tools/driver.makefile
-
BUILDCLASSES += Linux
APP := .
@@ -48,25 +47,24 @@ SOURCES += $(APPSRC)/runScript.c
DBDS += $(APPSRC)/runScript.dbd
SOURCES += $(APPSRC)/expr.c
-
-##
SOURCES += $(APPSRC)/dbLoadTemplate.y
DBDS += $(APPSRC)/dbLoadTemplate.dbd
# ESS doesn't have any T2_ppc604 and vxWorks target
# Friday, May 11 22:05:07 CEST 2018, jhlee
#
-#SOURCES_T2 += strdup.c
-#SOURCES_vxWorks += asprintf.c
+# SOURCES_T2 += strdup.c
+# SOURCES_vxWorks += asprintf.c
#
-#HEADERS += strdup.h
-#HEADERS += asprintf.h
+# HEADERS += strdup.h
+# HEADERS += asprintf.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
+#
USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include
USR_CFLAGS += --std=c99
@@ -75,42 +73,37 @@ USR_CFLAGS += --std=c99
# instead of its name. ESS require can handle them within the EPICS
# IOC shell internally.
#
-#USR_CFLAGS += -DT_A='"${T_A}"'
+# USR_CFLAGS += -DT_A='"${T_A}"'
# ESS doesn't support WIN32
# This should really go into some global WIN32 config file
+#
# USR_CFLAGS_WIN32 += /D_WIN32_WINNT=0x501
-
TEMPLATES += $(APPDB)/moduleversion.template
-#TEMPLATES += moduleversion.db
+# TEMPLATES += moduleversion.db
vpath dbLoadTemplate_lex.l ../$(APPSRC)
dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
-## moduleversion should convert to db instead of template
-## So, ESS uses it internally independent upon any IOC
-## varialbes
-
+# moduleversion should convert to db instead of template
+# So, ESS uses it internally independent upon any IOC
+# variables
+#
EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
MSI = $(EPICS_BASE_HOST_BIN)/msi
-
USR_DBFLAGS += -I . -I ..
USR_DBFLAGS += -I$(EPICS_BASE)/db
-
TMPS = $(wildcard $(APPDB)/*.template)
+.PHONY: db
db: $(TMPS)
+.PHONY: $(TMPS)
$(TMPS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d
@$(MSI) $(USR_DBFLAGS) -o $(basename $(@)).db $@
-
-
-
-
-.PHONY: db $(TMPS)
--
GitLab