]>
Commit | Line | Data |
---|---|---|
c73b4e92 MM |
1 | diff -urN vmmon-only.org/Makefile vmmon-only/Makefile |
2 | --- vmmon-only.org/Makefile 2004-05-12 16:49:05.732456176 +0200 | |
3 | +++ vmmon-only/Makefile 2004-05-12 16:57:25.454486880 +0200 | |
4 | @@ -14,9 +14,9 @@ | |
5 | VM_UNAME = $(shell uname -r) | |
6 | ||
7 | # Header directory for the running kernel | |
8 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include | |
9 | +HEADER_DIR = /usr/src/linux/include | |
10 | ||
11 | -BUILD_DIR = $(HEADER_DIR)/.. | |
12 | +BUILD_DIR = . | |
13 | ||
14 | DRIVER := vmmon | |
15 | ||
16 | @@ -55,9 +55,6 @@ | |
17 | ||
18 | VMCCVER := $(shell $(CC) -dumpversion) | |
19 | ||
20 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... | |
21 | -ifeq ($(VERSION),) | |
22 | - | |
23 | ifeq ($(VM_KBUILD), 24) | |
24 | DRIVER_KO := $(DRIVER).o | |
25 | else | |
26 | @@ -72,41 +69,14 @@ | |
27 | $(DRIVER): $(DRIVER_KO) | |
28 | cp -f $< $@ | |
29 | ||
30 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler | |
31 | -VM_CCVER := $(VMCCVER) | |
32 | -export VM_CCVER | |
33 | -VM_CC := $(CC) | |
34 | -export VM_CC | |
35 | - | |
36 | MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) | |
37 | ||
38 | $(DRIVER_KO): | |
39 | make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules | |
40 | ||
41 | -else | |
42 | - | |
43 | -ifneq ($(VM_CCVER), $(VMCCVER)) | |
44 | -$(warning *** Inappropriate build environment: you wanted to use gcc \ | |
45 | - version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).) | |
46 | -$(error For proper build you'll have to replace $(CC) with symbolic \ | |
47 | - link to $(VM_CC)) | |
48 | -endif | |
49 | - | |
50 | -endif | |
51 | ||
52 | include $(SRCROOT)/Makefile.kernel | |
53 | ||
54 | -ifdef TOPDIR | |
55 | -ifeq ($(VM_KBUILD), 24) | |
56 | - | |
57 | -O_TARGET := $(DRIVER).o | |
58 | - | |
59 | -obj-y := $($(DRIVER)-y) | |
60 | - | |
61 | -include $(TOPDIR)/Rules.make | |
62 | -endif | |
63 | -endif | |
64 | - | |
65 | else | |
66 | ||
67 | include $(SRCROOT)/Makefile.normal | |
68 | diff -urN vmnet-only.org/Makefile vmnet-only/Makefile | |
69 | --- vmnet-only.org/Makefile 2004-05-12 16:49:09.091945456 +0200 | |
70 | +++ vmnet-only/Makefile 2004-05-12 16:49:19.904301728 +0200 | |
71 | @@ -14,9 +14,9 @@ | |
72 | VM_UNAME = $(shell uname -r) | |
73 | ||
74 | # Header directory for the running kernel | |
75 | -HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include | |
76 | +HEADER_DIR = /usr/src/linux/include | |
77 | ||
78 | -BUILD_DIR = $(HEADER_DIR)/.. | |
79 | +BUILD_DIR = . | |
80 | ||
81 | DRIVER := vmnet | |
82 | ||
83 | @@ -90,9 +67,6 @@ | |
84 | ||
85 | VMCCVER := $(shell $(CC) -dumpversion) | |
86 | ||
87 | -# If there is no version defined, we are in toplevel pass, not yet in kernel makefiles... | |
88 | -ifeq ($(VERSION),) | |
89 | - | |
90 | ifeq ($(VM_KBUILD), 24) | |
91 | DRIVER_KO := $(DRIVER).o | |
92 | else | |
93 | @@ -102,41 +76,13 @@ | |
94 | auto-build: $(DRIVER_KO) | |
95 | cp -f $< $(SRCROOT)/../$(DRIVER).o | |
96 | ||
97 | -# Pass gcc version down the chain, so we can detect if kernel attempts to use unapproved compiler | |
98 | -VM_CCVER := $(VMCCVER) | |
99 | -export VM_CCVER | |
100 | -VM_CC := $(CC) | |
101 | -export VM_CC | |
102 | - | |
103 | MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) | |
104 | ||
105 | $(DRIVER_KO): | |
106 | make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules | |
107 | ||
108 | -else | |
109 | - | |
110 | -ifneq ($(VM_CCVER), $(VMCCVER)) | |
111 | -$(warning *** Inappropriate build environment: you wanted to use gcc \ | |
112 | - version $(VM_CCVER) while kernel attempts to use gcc version $(VMCCVER).) | |
113 | -$(error For proper build you'll have to replace $(CC) with symbolic \ | |
114 | - link to $(VM_CC)) | |
115 | -endif | |
116 | - | |
117 | -endif | |
118 | - | |
119 | include $(SRCROOT)/Makefile.kernel | |
120 | ||
121 | -ifdef TOPDIR | |
122 | -ifeq ($(VM_KBUILD), 24) | |
123 | - | |
124 | -O_TARGET := $(DRIVER).o | |
125 | - | |
126 | -obj-y := $($(DRIVER)-y) | |
127 | - | |
128 | -include $(TOPDIR)/Rules.make | |
129 | -endif | |
130 | -endif | |
131 | - | |
132 | else | |
133 | ||
134 | include $(SRCROOT)/Makefile.normal |