Drop version.h

Some distributions use their own Makefile and thus won't create version.h,
resulting in a build failure. Pass the version as define instead.
That won't help for generating the driver version with those distributions,
but at least the driver will build.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 6702033..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-version.h

diff --git a/Makefile b/Makefile
index e702b2c6e61c2e452abb982a82c56af049b30e4c..d4b96c3b26400d777a761a72fe20fe05c30cf2d0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,17 +44,13 @@ all: modules
 
 # Targets for running make directly in the external module directory:
 
-DRIVER_VERSION = $(shell git describe --long)
+EXTRA_CFLAGS=-DIT87_DRIVER_VERSION='\"$(shell git describe --long)\"'
 
-version.h: it87.c
-       @echo "#define IT87_DRIVER_VERSION      \"$(DRIVER_VERSION)\"" > version.h
-
-modules: version.h
-       @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) $@
+modules:
+       @$(MAKE) EXTRA_CFLAGS=$(EXTRA_CFLAGS) -C $(KERNEL_BUILD) M=$(CURDIR) $@
 
 clean:
        @$(MAKE) -C $(KERNEL_BUILD) M=$(CURDIR) $@
-       rm -f version.h
 
 install: modules_install
 

diff --git a/it87.c b/it87.c
index acbc1ff5a2bc26a2c00bb5f6fb6e35a9da77c84d..fc9ee80342fcfa6e2803973d1f9ca1883d3ba45e 100644 (file)
--- a/it87.c
+++ b/it87.c
@@ -74,7 +74,10 @@
 #include <linux/acpi.h>
 #include <linux/io.h>
 #include "compat.h"
-#include "version.h"
+
+#ifndef IT87_DRIVER_VERSION
+#define IT87_DRIVER_VERSION    "<not provided>"
+#endif
 
 #define DRVNAME "it87"