diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-03-12 17:13:25 -0800 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-09-23 08:44:58 -0600 |
| commit | fa99c29cd3b2512d764d2b9a8098919492463658 (patch) | |
| tree | e8232a8233fdb04c9489b2f99b535a572c8fcb80 /Makefile | |
| parent | 78ba6223a14eac73a1fbfc35bd456348171bffc6 (diff) | |
UBUNTU: (no-up) fold down debian for ubuntu-oneiric 3.0-rc1 rebase
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -354,14 +354,23 @@ CFLAGS_KERNEL = AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage +# Prefer linux-backports-modules +ifneq ($(KBUILD_SRC),) +ifneq ($(shell if test -e $(KBUILD_OUTPUT)/ubuntu-build; then echo yes; fi),yes) +UBUNTUINCLUDE := -I/usr/src/linux-headers-lbm-$(KERNELRELEASE) +endif +endif # Use LINUXINCLUDE when you must reference the include/ directory. # Needed to be compatible with the O= option -LINUXINCLUDE := -I$(srctree)/arch/$(hdr-arch)/include \ +LINUXINCLUDE := $(UBUNTUINCLUDE) -I$(srctree)/arch/$(hdr-arch)/include \ -Iarch/$(hdr-arch)/include/generated -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ -include include/generated/autoconf.h +# UBUNTU: Include our third party driver stuff too +LINUXINCLUDE += -Iubuntu/include $(if $(KBUILD_SRC),-I$(srctree)/ubuntu/include) + KBUILD_CPPFLAGS := -D__KERNEL__ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ @@ -507,7 +516,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf # Objects we will link into vmlinux / subdirs we need to visit init-y := init/ -drivers-y := drivers/ sound/ firmware/ +drivers-y := drivers/ sound/ firmware/ ubuntu/ net-y := net/ libs-y := lib/ core-y := usr/ |