diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-02-18 02:53:36 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-02-18 02:53:36 +0000 |
| commit | 4791dc885619b1a6460c1fcf48f648945feea4d3 (patch) | |
| tree | c8836b6b99a1bc7f2c455d2ad4089939f5098118 /linux-core/Makefile | |
| parent | 585f34c3e533cafd687beba161d6d0379b52bb47 (diff) | |
major realigment of DRM CVS with kernel code, makes integration much easier
Diffstat (limited to 'linux-core/Makefile')
| -rw-r--r-- | linux-core/Makefile | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/linux-core/Makefile b/linux-core/Makefile index ab3609ba..9bb578cd 100644 --- a/linux-core/Makefile +++ b/linux-core/Makefile @@ -44,10 +44,17 @@ LINUXDIR := $(shell if [ -e /lib/modules/$(RUNNING_REL)/source ]; then \ endif ifndef O -O := $(LINUXDIR) +O := $(shell if [ -e /lib/modules/$(RUNNING_REL)/build ]; then \ + echo /lib/modules/$(RUNNING_REL)/build; \ + else echo ""; fi) +#O := $(LINUXDIR) endif +ifdef ARCH +MACHINE := $(ARCH) +else MACHINE := $(shell uname -m) +endif # Modules for all architectures MODULE_LIST := drm.o tdfx.o r128.o radeon.o mga.o sis.o savage.o via.o \ @@ -61,7 +68,7 @@ endif ifneq (,$(findstring sparc64,$(MACHINE))) ARCHSPARC64 := 1 -MODULE_LIST += ffb.o +#MODULE_LIST += ffb.o endif DRM_MODULES ?= $(MODULE_LIST) @@ -370,7 +377,6 @@ endif # These require AGP support -ifdef CONFIG_AGP ifneq (,$(findstring i810,$(DRM_MODULES))) CONFIG_DRM_I810 := m endif @@ -380,7 +386,6 @@ endif ifneq (,$(findstring i915,$(DRM_MODULES))) CONFIG_DRM_I915 := m endif -endif include $(DRMSRCDIR)/Makefile.kernel |