From 1b345481ba279239bc30a38ca364bfb72736ddff Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 14 Nov 2011 17:38:36 -0600
Subject: [PATCH] ioc/db: Generate menuGlobal.dbd

The source just duplicates what's in the Makefile anyway.
---
 src/ioc/db/Makefile            | 27 ++++++++++++++-------------
 src/ioc/db/RULES               |  9 +++++----
 src/ioc/db/menuGlobal.dbd      | 19 -------------------
 src/ioc/dbStatic/dbStaticLib.c |  4 ++--
 4 files changed, 21 insertions(+), 38 deletions(-)
 delete mode 100644 src/ioc/db/menuGlobal.dbd

diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile
index 50715ad32..8bfec9434 100644
--- a/src/ioc/db/Makefile
+++ b/src/ioc/db/Makefile
@@ -30,24 +30,25 @@ INC += db_field_log.h
 INC += initHooks.h
 INC += recGbl.h
 INC += dbIocRegister.h
-# The following go away what old database access goes away
 INC += db_access_routines.h
 INC += db_convert.h
 
-DBDINC += menuAlarmSevr
-DBDINC += menuAlarmStat
-DBDINC += menuCompress
-DBDINC += menuFtype
-DBDINC += menuIvoa
-DBDINC += menuOmsl
-DBDINC += menuPini
-DBDINC += menuPriority
-DBDINC += menuScan
-DBDINC += menuYesNo
-DBDINC += menuSimm
+# Generate menuGlobal.dbd automatically
+DBD += menuGlobal.dbd
+menuGlobal_DBD += menuAlarmSevr.dbd
+menuGlobal_DBD += menuAlarmStat.dbd
+menuGlobal_DBD += menuCompress.dbd
+menuGlobal_DBD += menuFtype.dbd
+menuGlobal_DBD += menuIvoa.dbd
+menuGlobal_DBD += menuOmsl.dbd
+menuGlobal_DBD += menuPini.dbd
+menuGlobal_DBD += menuPriority.dbd
+menuGlobal_DBD += menuScan.dbd
+menuGlobal_DBD += menuYesNo.dbd
+menuGlobal_DBD += menuSimm.dbd
 
+DBDINC += $(basename $(menuGlobal_DBD))
 DBDINC += dbCommon
-DBD+=  menuGlobal.dbd
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES
index 14a421e5c..cdbcdac60 100644
--- a/src/ioc/db/RULES
+++ b/src/ioc/db/RULES
@@ -11,15 +11,16 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-$(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
+# $(filter-out $(STATIC_SRCS),$(dbCore_SRCS)) : $(COMMON_DIR)/dbCommon.h
 
 dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
 	@$(RM) $@
-	@-$(MKMF) -m $@ ../db  $(COMMON_DIR)/dbCommon.h $<
+	@$(MKMF) -m $@ ../db $(COMMON_DIR)/dbCommon.h $<
 
 $(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/dbCommon.dbd
-	$(RM) $@
-	$(DBTORECORDTYPEH) -I ../db $< $@
+	@$(RM) $(notdir $@)
+	$(DBTORECORDTYPEH) -I ../db $< $(notdir $@)
+	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/dbCommon.h: $(DBTORECORDTYPEH)
 
diff --git a/src/ioc/db/menuGlobal.dbd b/src/ioc/db/menuGlobal.dbd
deleted file mode 100644
index 16a0bbc34..000000000
--- a/src/ioc/db/menuGlobal.dbd
+++ /dev/null
@@ -1,19 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2009 UChicago Argonne LLC, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE is distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-include "menuAlarmSevr.dbd"
-include "menuAlarmStat.dbd"
-include "menuCompress.dbd"
-include "menuFtype.dbd"
-include "menuIvoa.dbd"
-include "menuOmsl.dbd"
-include "menuPini.dbd"
-include "menuPriority.dbd"
-include "menuScan.dbd"
-include "menuSimm.dbd"
-include "menuYesNo.dbd"
diff --git a/src/ioc/dbStatic/dbStaticLib.c b/src/ioc/dbStatic/dbStaticLib.c
index cf2ee47f6..a12c01e55 100644
--- a/src/ioc/dbStatic/dbStaticLib.c
+++ b/src/ioc/dbStatic/dbStaticLib.c
@@ -904,9 +904,9 @@ long epicsShareAPI dbWriteRecordFP(
     if(!precordTypename) {
 	status = dbFirstRecordType(pdbentry);
 	if(status) {
-	    fprintf(stderr,"dbWriteRecordFP: No record descriptions\n");
+	    /* No record descriptions, so no record instances */
     	    dbFinishEntry(pdbentry);
-	    return(status);
+	    return(0);
 	}
     } else {
 	status = dbFindRecordType(pdbentry,precordTypename);