[kernel] r18086 - in dists/trunk/linux-tools/debian/build: . scripts scripts/basic scripts/genksyms scripts/kconfig scripts/mod
Bastian Blank
waldi at alioth.debian.org
Tue Sep 13 15:01:02 UTC 2011
Author: waldi
Date: Tue Sep 13 15:01:01 2011
New Revision: 18086
Log:
debian/build
- Always define top_srcdir and VPATH.
- Fix build of genksyms and kconfig.
Modified:
dists/trunk/linux-tools/debian/build/Makefile
dists/trunk/linux-tools/debian/build/Makefile.inc
dists/trunk/linux-tools/debian/build/scripts/Makefile
dists/trunk/linux-tools/debian/build/scripts/basic/Makefile
dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile
dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile
dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
Modified: dists/trunk/linux-tools/debian/build/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -8,6 +8,4 @@
OUTDIR = .
-top_srcdir = .
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/Makefile.inc
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile.inc Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/Makefile.inc Tue Sep 13 15:01:01 2011 (r18086)
@@ -1,8 +1,13 @@
+top_srcdir = $(dir $(lastword $(MAKEFILE_LIST)))/../..
+
+VPATH = $(top_srcdir)/$(OUTDIR)
+
SHELL = /bin/sh -e
CC = gcc
CXX = g++
CFLAGS ?= -O2 -Wall
+CPPFLAGS = -I$(top_srcdir)/$(OUTDIR) -I$(top_srcdir)/debian/build/$(OUTDIR)
CXXFLAGS = $(CFLAGS)
all: all-local all-recursive
Modified: dists/trunk/linux-tools/debian/build/scripts/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/scripts/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -43,8 +43,4 @@
OUTDIR = scripts
-top_srcdir = ..
-
-VPATH = $(top_srcdir)/scripts
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ..//Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/basic/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/basic/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/scripts/basic/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -3,8 +3,4 @@
OUTDIR = scripts/basic
-top_srcdir = ../..
-
-VPATH = $(top_srcdir)/$(OUTDIR)
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ../../Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -2,17 +2,11 @@
OUTDIR = scripts/genksyms
-top_srcdir = ../..
+include ../../Makefile.inc
-VPATH = $(top_srcdir)/$(OUTDIR)
+genksyms: genksyms.o parse.tab.o lex.lex.o
-include $(top_srcdir)/debian/build/Makefile.inc
-
-CFLAGS += -I$(VPATH)
-
-genksyms: genksyms.o parse.o lex.o
-
-lex.o: keywords.c parse.h
+lex.lex.o: keywords.hash.c parse.tab.h
%.c: %.c_shipped
ln -s $< $@
@@ -21,4 +15,4 @@
ln -s $< $@
clean:
- rm -f keywords.c parse.h
+ rm -f keywords.hash.c parse.tab.c parse.tab.h
Modified: dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -2,17 +2,11 @@
OUTDIR = scripts/kconfig
-top_srcdir = ../..
-
-VPATH = $(top_srcdir)/$(OUTDIR)
-
-include $(top_srcdir)/debian/build/Makefile.inc
-
-CFLAGS += -I$(VPATH)
+include ../../Makefile.inc
conf: conf.o zconf.tab.o
-zconf.tab.c: zconf.hash.c lex.zconf.c
+zconf.tab.c: zconf.hash.c zconf.lex.c
%.c: %.c_shipped
ln -sf $< $@
@@ -21,4 +15,4 @@
ln -sf $< $@
clean:
- rm -f zconf.tab.c zconf.hash.c lex.zconf.c
+ rm -f zconf.tab.c zconf.hash.c zconf.lex.c
Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile Tue Sep 13 14:44:15 2011 (r18085)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile Tue Sep 13 15:01:01 2011 (r18086)
@@ -7,9 +7,7 @@
OUTDIR = scripts/mod
-top_srcdir = ../..
-
-include $(top_srcdir)/debian/build/Makefile.inc
+include ../../Makefile.inc
modpost.real-%:
$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/scripts/mod
More information about the Kernel-svn-changes
mailing list