[kernel] r13234 - in dists/trunk/linux-kbuild-2.6: . scripts scripts/basic scripts/genksyms scripts/kconfig scripts/mod

Bastian Blank waldi at alioth.debian.org
Tue Mar 24 09:28:28 UTC 2009


Author: waldi
Date: Tue Mar 24 09:28:26 2009
New Revision: 13234

Log:
Makefile, scripts/Makefile, scripts/basic/Makefile, scripts/genksyms/Makefile,
scripts/kconfig/Makefile, scripts/mod/Makefile.real:
Properly specify top_srcdir.


Modified:
   dists/trunk/linux-kbuild-2.6/Makefile
   dists/trunk/linux-kbuild-2.6/scripts/Makefile
   dists/trunk/linux-kbuild-2.6/scripts/basic/Makefile
   dists/trunk/linux-kbuild-2.6/scripts/genksyms/Makefile
   dists/trunk/linux-kbuild-2.6/scripts/kconfig/Makefile
   dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile.real

Modified: dists/trunk/linux-kbuild-2.6/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/Makefile	Tue Mar 24 09:28:26 2009
@@ -7,4 +7,6 @@
 
 OUTDIR = .
 
+top_srcdir = .
+
 include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/Makefile	Tue Mar 24 09:28:26 2009
@@ -39,6 +39,8 @@
 
 OUTDIR = scripts
 
+top_srcdir = ..
+
 VPATH = $(top_srcdir)/kbuild/scripts
 
 include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/basic/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/basic/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/basic/Makefile	Tue Mar 24 09:28:26 2009
@@ -3,6 +3,9 @@
 	fixdep
 
 OUTDIR = scripts/basic
-VPATH = $(top_srcdir)/kbuild/scripts/basic
+
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
 include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/genksyms/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/genksyms/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/genksyms/Makefile	Tue Mar 24 09:28:26 2009
@@ -1,9 +1,14 @@
 PROGS = genksyms
 
 OUTDIR = scripts/genksyms
-VPATH = $(top_srcdir)/kbuild/scripts/genksyms
 
-CFLAGS += -I$(top_srcdir)/kbuild/scripts/genksyms
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+
+include $(top_srcdir)/Makefile.inc
+
+CFLAGS += -I$(VPATH)
 
 genksyms: genksyms.o parse.o lex.o
 
@@ -14,5 +19,3 @@
 
 %.h: %.h_shipped
 	ln -s $< $@
-
-include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/kconfig/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/kconfig/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/kconfig/Makefile	Tue Mar 24 09:28:26 2009
@@ -1,9 +1,14 @@
 PROGS = conf
 
 OUTDIR = scripts/kconfig
-VPATH = $(top_srcdir)/kbuild/scripts/kconfig
 
-CFLAGS += -I$(top_srcdir)/kbuild/scripts/kconfig
+top_srcdir = ../..
+
+VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+
+include $(top_srcdir)/Makefile.inc
+
+CFLAGS += -I$(VPATH)
 
 conf: conf.o zconf.tab.o
 
@@ -14,5 +19,3 @@
 
 %.h: %.h_shipped
 	ln -sf $< $@
-
-include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile.real	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile.real	Tue Mar 24 09:28:26 2009
@@ -1,5 +1,7 @@
 PROGS = modpost.real-$(TYPE)
 
+top_srcdir = ../..
+
 CFLAGS += -I$(top_srcdir)/kbuild/include
 
 include $(top_srcdir)/Makefile.inc



More information about the Kernel-svn-changes mailing list