[devel-adjust_build_to_restructure]

- Add toplevel Imakefile and man/Imakefile.
- Add preliminary README explaining how to build the driver (new structure
    requires make Makefiles on top of xmkmf)
- Bump version number to 0.2.0. This is to avoid the ambiguity introduced
    by the forkers when they decided to bump their patchlevel to 0.1.31,
    while r31 never appeared on unichrome.sf.net. xf86-video-unichrome will
    have 0.2.0 for CVS, and 0.2.1 for the first release.

5 files changed, 64 insertions, 12 deletions

diff --git a/Imakefile b/Imakefile
new file mode 100644
index 0000000..17e35b0
--- /dev/null
+++ b/Imakefile
@@ -0,0 +1,7 @@
+#include <Server.tmpl>
+#define IHaveSubdirs
+
+SUBDIRS = src man
+
+MakeSubdirs($(SUBDIRS))
+ForceSubdirs($(SUBDIRS))
diff --git a/README b/README
new file mode 100644
index 0000000..f9ce2e7
--- /dev/null
+++ b/README
@@ -0,0 +1,43 @@
+Building The Unichrome Projects drivers for your X version:
+-----------------------------------------------------------
+
+WARNING: The content of this file is about building and installing this
+driver yourself. This will not make your package manager happy. You might
+also want to back up via_drv.o/so and the manpage first.
+
+If you run into any difficulties, please contact the unichrome-users
+mailinglist at unichrome-users@lists.sourceforge.net . Subscribe at 
+http://lists.sourceforge.net/mailman/listinfo/unichrome-users first.
+
+
+1) Monolithic X:
+
+    Applies to xfree86 4.3.x and 4.4.x, and X.org 6.7.x, 6.8.x and 6.9.x.
+
+1.1) Against a full X tree:
+
+    This requires that a sufficiently built X tree is present (see 1.2
+    otherwise). The top level directory of an X tree tends to be named xc/.
+    Replace <path_to_xc> with whatever is suited for you.
+
+    From the top level, in xf86-video-unichrome/, (the same level as this
+    file) run:
+
+	xmkmf <path_to_xc>
+	make Makefiles
+	make
+	make install
+
+1.2) Preparing an X tree:
+
+    ...
+
+1.3) Against the SDK/DDK:
+
+    ...
+
+2) Modular X:
+
+    This is only suited for the X.org 7.x release.
+
+    ...
diff --git a/man/Imakefile b/man/Imakefile
new file mode 100644
index 0000000..ff4458c
--- /dev/null
+++ b/man/Imakefile
@@ -0,0 +1,13 @@
+#define IHaveModules
+#include <Server.tmpl>
+
+
+#if !defined(XF86DriverSDK)
+
+#ifdef XF86_VERSION_CURRENT
+CppManTarget(via,)
+#endif
+
+InstallModuleManPage(via)
+
+#endif
diff --git a/src/Imakefile b/src/Imakefile
index aa858a1..effc8d3 100644
--- a/src/Imakefile
+++ b/src/Imakefile
@@ -36,12 +36,6 @@ DEFXNEEDDRMLOCK = -DX_NEED_DRMLOCK
 
 #else
 XCOMM We are using X.org
-XCOMM The XF86_VERSION stuff just had to be renamed it seems. Why
-XCOMM they kept XORG_VERSION at all I don't know, since they are 
-XCOMM apparently not bothering with altering it. Both the x.org 
-XCOMM release and a cvs checkout (3m after release) here are 
-XCOMM 6.7.0.0.0. Luckily, apart from the drm.h location, this is 
-XCOMM not a problem... yet. -- luc
 
 DEFLINFB = -DX_USE_LINEARFB
 DEFREGIONNULL = -DX_USE_REGION_NULL
@@ -154,11 +148,6 @@ InstallVideoObjectModule(via,$(MODULEDIR))
 InstallObjectModule(via,$(MODULEDIR),drivers)
 #endif
 
-#if !defined(XF86DriverSDK)
-CppManTarget(via,)
-InstallModuleManPage(via)
-#endif
-
 DependTarget()
 
 InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/via)
diff --git a/src/via_driver.h b/src/via_driver.h
index bd112ae..47b48c8 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -67,7 +67,7 @@
 
 #define DRIVER_NAME     "via"
 #define VERSION_MAJOR   0
-#define VERSION_MINOR   0
+#define VERSION_MINOR   2
 #define PATCHLEVEL      0
 #define VIA_VERSION     ((VERSION_MAJOR<<24) | (VERSION_MINOR<<16) | PATCHLEVEL)