Skip to content
This repository
Browse code

gdev: fixed configure files

  • Loading branch information...
commit 6a5f06c8ff125c059cfcf677fc1e8df11386bb1b 1 parent 86763f0
Shinpei Kato authored

Showing 3 changed files with 28 additions and 24 deletions. Show diff stats Hide diff stats

  1. +1 1  cuda/configure
  2. +9 8 driver/configure
  3. +18 15 runtime/configure
2  cuda/configure
... ... @@ -1,7 +1,7 @@
1 1 #!/bin/sh
2 2
3 3 # libcuda or kcuda
4   -target=''
  4 +target='libcuda'
5 5
6 6 # parse the given options.
7 7 for option
17 driver/configure
... ... @@ -1,10 +1,11 @@
1 1 #!/bin/sh
2 2
3   -gdev="gdev"
4   -common="common"
  3 +gdev='gdev'
  4 +common='common'
5 5
6   -# configure options.
7   -driver="pscnv" # use pscnv by default.
  6 +# pscnv or nouveau
  7 +backend='pscnv'
  8 +# debug on/off
8 9 debug=0
9 10
10 11 # parse the given options.
@@ -16,17 +17,17 @@ do
16 17 esac
17 18
18 19 case "$option" in
19   - --driver=*)
20   - driver="$optarg" ;;
  20 + --backend=*)
  21 + backend="$optarg" ;;
21 22 --debug)
22 23 debug=1 ;;
23 24 esac
24 25 done
25 26
26 27 rm -f $gdev.ko
27   -ln -s $driver.ko $gdev.ko
  28 +ln -s $backend.ko $gdev.ko
28 29 cp -fr ../$gdev/* ./
29   -cp -fr ../$driver/* ./
  30 +cp -fr ../$backend/* ./
30 31 cp -fr ../../$common/* ./
31 32 cat ../$gdev/Makefile >> Makefile
32 33 ./configure
33 runtime/configure
... ... @@ -1,12 +1,13 @@
1 1 #!/bin/sh
2 2
3   -topdir="../.."
4   -gdev="gdev"
5   -common="common"
  3 +topdir='../..'
  4 +common='common'
6 5
7   -# configure options.
8   -runtime="kernel" # use kernel-level runtime by default
9   -driver="pscnv" # use pscnv by default.
  6 +# kernel-space Gdev or user-space Gdev
  7 +target='kernel'
  8 +# pscnv or nouveau
  9 +backend='pscnv'
  10 +# debug on/off
10 11 debug=0
11 12
12 13 # parse the given options.
@@ -18,20 +19,22 @@ do
18 19 esac
19 20
20 21 case "$option" in
21   - --runtime=*)
22   - runtime="$optarg" ;;
23   - --driver=*)
24   - driver="$optarg" ;;
  22 + --target=*)
  23 + target="$optarg" ;;
  24 + --backend=*)
  25 + backend="$optarg" ;;
25 26 --debug)
26 27 debug=1 ;;
27 28 esac
28 29 done
29 30
30   -if [ $runtime = 'kernel' ]; then
31   -cp -f ../$runtime/* .
  31 +if [ $target = 'kernel' ] ; then
  32 +cp -f ../kernel/* .
32 33 cp -f $topdir/$common/*.h .
33   -else
34   -cp -f ../$runtime/$gdev/* .
35   -cp -f ../$runtime/$driver/* .
  34 +elif [ $target = 'user' ] ; then
  35 +cp -f ../user/gdev/* .
  36 +cp -f ../user/$backend/* .
36 37 cp -f $topdir/$common/* .
  38 +else
  39 +echo "Error: invalid target '$target'"
37 40 fi

0 comments on commit 6a5f06c

Please sign in to comment.
Something went wrong with that request. Please try again.