version: Update header files now that version.c is not auto generated

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/util.h b/src/util.h
index 7bfd2b8051de4f418fcaf0c00ccf91825a9c6c86..557eb8b0d085beb6b3900fb2c7cbc0a1dda5bfb2 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -232,13 +232,12 @@ void code_mutable_preinit(void);
 void serial_setup(void);
 void lpt_setup(void);
 
+// version.c
+extern const char VERSION[], BUILDINFO[];
+
 // vgahooks.c
 void handle_155f(struct bregs *regs);
 void handle_157f(struct bregs *regs);
 void vgahook_setup(struct pci_device *pci);
 
-
-// version (auto generated file out/version.c)
-extern const char VERSION[], BUILDINFO[];
-
 #endif // util.h

diff --git a/vgasrc/vgainit.c b/vgasrc/vgainit.c
index 4050c96a1c70560e9c9dca33b619510ad9591dd5..c6c8149083973b9a925ecc838b9cf3cfe702f3ca 100644 (file)
--- a/vgasrc/vgainit.c
+++ b/vgasrc/vgainit.c
@@ -14,7 +14,6 @@
 #include "std/optionrom.h" // struct pci_data
 #include "std/pmm.h" // struct pmmheader
 #include "string.h" // checksum_far
-#include "util.h" // VERSION
 #include "vgabios.h" // SET_VGA
 #include "vgahw.h" // vgahw_setup
 #include "vgautil.h" // swcursor_check_event

diff --git a/vgasrc/vgautil.h b/vgasrc/vgautil.h
index 79c16be75c99a725f2e258a8b996a86ba5feb475..08c4e8dca0794196e249e300581a221a0f8152a5 100644 (file)
--- a/vgasrc/vgautil.h
+++ b/vgasrc/vgautil.h
@@ -87,4 +87,7 @@ extern u8 vgafont16alt[];
 extern int VgaBDF;
 extern int HaveRunInit;
 
+// vgaversion.c
+extern const char VERSION[], BUILDINFO[];
+
 #endif // vgautil.h