From 733aadaa7768284b2a1ddafaeda19be481a7dfc8 Mon Sep 17 00:00:00 2001
From: wpbonelli <wbonelli@ucar.edu>
Date: Thu, 7 Dec 2023 13:58:13 -0500
Subject: [PATCH] update makefiles and msvs files

---
 make/makefile                      | 10 +++++-----
 utils/mf5to6/make/makefile         |  7 ++++---
 utils/mf5to6/msvs/mf5to6.vfproj    |  1 +
 utils/mf5to6/pymake/extrafiles.txt |  1 +
 utils/zonebudget/make/makefile     |  8 ++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/make/makefile b/make/makefile
index 3ab9a570ea9..cd2e35d8612 100644
--- a/make/makefile
+++ b/make/makefile
@@ -76,17 +76,16 @@ ${SOURCEDIR32}
 OBJECTS = \
 $(OBJDIR)/kind.o \
 $(OBJDIR)/Constants.o \
-$(OBJDIR)/SimVariables.o \
 $(OBJDIR)/ErrorUtil.o \
-$(OBJDIR)/genericutils.o \
+$(OBJDIR)/SimVariables.o \
+$(OBJDIR)/ArrayHandlers.o \
+$(OBJDIR)/Message.o \
 $(OBJDIR)/defmacro.o \
 $(OBJDIR)/compilerversion.o \
-$(OBJDIR)/ArrayHandlers.o \
 $(OBJDIR)/version.o \
-$(OBJDIR)/Message.o \
 $(OBJDIR)/Sim.o \
 $(OBJDIR)/OpenSpec.o \
-$(OBJDIR)/MathUtil.o \
+$(OBJDIR)/genericutils.o \
 $(OBJDIR)/InputOutput.o \
 $(OBJDIR)/TableTerm.o \
 $(OBJDIR)/Table.o \
@@ -325,6 +324,7 @@ $(OBJDIR)/BaseGeometry.o \
 $(OBJDIR)/mf6.o \
 $(OBJDIR)/StringList.o \
 $(OBJDIR)/MemorySetHandler.o \
+$(OBJDIR)/MathUtil.o \
 $(OBJDIR)/ilut.o \
 $(OBJDIR)/sparsekit.o \
 $(OBJDIR)/rcm.o \
diff --git a/utils/mf5to6/make/makefile b/utils/mf5to6/make/makefile
index 5fd9b2f1d12..00f87156629 100644
--- a/utils/mf5to6/make/makefile
+++ b/utils/mf5to6/make/makefile
@@ -28,16 +28,17 @@ ${SOURCEDIR8}
 OBJECTS = \
 $(OBJDIR)/kind.o \
 $(OBJDIR)/Constants.o \
+$(OBJDIR)/Global.o \
 $(OBJDIR)/SimVariables.o \
-$(OBJDIR)/genericutils.o \
+$(OBJDIR)/ArrayHandlers.o \
+$(OBJDIR)/Message.o \
 $(OBJDIR)/defmacro.o \
 $(OBJDIR)/compilerversion.o \
 $(OBJDIR)/version.o \
 $(OBJDIR)/OpenSpec.o \
-$(OBJDIR)/Global.o \
 $(OBJDIR)/GlobalVariables.o \
-$(OBJDIR)/ArrayHandlers.o \
 $(OBJDIR)/SimPHMF.o \
+$(OBJDIR)/genericutils.o \
 $(OBJDIR)/InputOutput.o \
 $(OBJDIR)/TableTerm.o \
 $(OBJDIR)/Table.o \
diff --git a/utils/mf5to6/msvs/mf5to6.vfproj b/utils/mf5to6/msvs/mf5to6.vfproj
index f2f4308ae4f..f206d7d30aa 100644
--- a/utils/mf5to6/msvs/mf5to6.vfproj
+++ b/utils/mf5to6/msvs/mf5to6.vfproj
@@ -104,6 +104,7 @@
 			<Tool Name="VFFortranCompilerTool" Preprocess="preprocessYes"/></FileConfiguration></File>
 		<File RelativePath="..\..\..\src\Utilities\DevFeature.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\genericutils.f90"/>
+		<File RelativePath="..\..\..\src\Utilities\Message.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\ErrorUtil.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\InputOutput.f90"/>
 		<File RelativePath="..\..\..\src\Utilities\GeomUtil.f90"/>
diff --git a/utils/mf5to6/pymake/extrafiles.txt b/utils/mf5to6/pymake/extrafiles.txt
index 0590f14ebf5..6b5a9b976c4 100644
--- a/utils/mf5to6/pymake/extrafiles.txt
+++ b/utils/mf5to6/pymake/extrafiles.txt
@@ -10,6 +10,7 @@
 ../../../src/Utilities/SimVariables.f90
 ../../../src/Utilities/compilerversion.F90
 ../../../src/Utilities/genericutils.f90
+../../../src/Utilities/Message.f90
 ../../../src/Utilities/ErrorUtil.f90
 ../../../src/Utilities/GeomUtil.f90
 ../../../src/Utilities/InputOutput.f90
diff --git a/utils/zonebudget/make/makefile b/utils/zonebudget/make/makefile
index 09354769be3..db96d3c3471 100644
--- a/utils/zonebudget/make/makefile
+++ b/utils/zonebudget/make/makefile
@@ -16,16 +16,16 @@ ${SOURCEDIR2}
 OBJECTS = \
 $(OBJDIR)/kind.o \
 $(OBJDIR)/Constants.o \
-$(OBJDIR)/SimVariables.o \
 $(OBJDIR)/ErrorUtil.o \
-$(OBJDIR)/genericutils.o \
+$(OBJDIR)/SimVariables.o \
+$(OBJDIR)/ArrayHandlers.o \
+$(OBJDIR)/Message.o \
 $(OBJDIR)/defmacro.o \
 $(OBJDIR)/compilerversion.o \
-$(OBJDIR)/ArrayHandlers.o \
 $(OBJDIR)/version.o \
-$(OBJDIR)/Message.o \
 $(OBJDIR)/Sim.o \
 $(OBJDIR)/OpenSpec.o \
+$(OBJDIR)/genericutils.o \
 $(OBJDIR)/InputOutput.o \
 $(OBJDIR)/LongLineReader.o \
 $(OBJDIR)/DevFeature.o \