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

[Bastian Blank]

Author: waldi
Date: Sun Feb 22 14:05:13 2009
New Revision: 12906

Log:
* Makefile.inc
  - Move from scripts/Makefile.inc.
  - Install things into the root of the output.
* scripts/Makefile, scripts/basic/Makefile,
  scripts/genksyms/Makefile, scripts/kconfig/Makefile,
  scripts/mod/Makefile, scripts/mod/Makefile.real
  - Fix output dirs.
  - Find included Makefile at the root of the source tree.


Added:
   dists/trunk/linux-kbuild-2.6/Makefile.inc   (contents, props changed)
      - copied, changed from r12905, /dists/trunk/linux-kbuild-2.6/scripts/Makefile.inc
Removed:
   dists/trunk/linux-kbuild-2.6/scripts/Makefile.inc
Modified:
   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
   dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile.real

Copied: dists/trunk/linux-kbuild-2.6/Makefile.inc (from r12905, /dists/trunk/linux-kbuild-2.6/scripts/Makefile.inc)
==============================================================================
--- /dists/trunk/linux-kbuild-2.6/scripts/Makefile.inc	(original)
+++ dists/trunk/linux-kbuild-2.6/Makefile.inc	Sun Feb 22 14:05:13 2009
@@ -22,23 +22,23 @@
 install-local: install-local-dir install-local-progs install-local-scripts install-local-data
 
 install-local-dir:
-	install -d "$(prefix)/scripts/$(OUTDIR)"
+	install -d "$(prefix)/$(OUTDIR)"
 
 install-local-progs: $(PROGS)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(prefix)/scripts/$(OUTDIR)'"; \
-	  install -m755 "$$p" "$(prefix)/scripts/$(OUTDIR)"; \
+	  echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
+	  install -m755 "$$p" "$(prefix)/$(OUTDIR)"; \
 	done
 
 install-local-scripts: $(SCRIPTS)
 	@for p in $^; do \
-	  echo " install -m755 '$$p' '$(prefix)/scripts/$(OUTDIR)'"; \
-	  install -m755 "$$p" "$(prefix)/scripts/$(OUTDIR)"; \
+	  echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
+	  install -m755 "$$p" "$(prefix)/$(OUTDIR)"; \
 	done
 
 install-local-data: $(DATA)
 	@for p in $^; do \
-	  echo " install -m644 '$$p' '$(prefix)/scripts/$(OUTDIR)'"; \
-	  install -m644 "$$p" "$(prefix)/scripts/$(OUTDIR)"; \
+	  echo " install -m644 '$$p' '$(prefix)/$(OUTDIR)'"; \
+	  install -m644 "$$p" "$(prefix)/$(OUTDIR)"; \
 	done
 

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	Sun Feb 22 14:05:13 2009
@@ -37,6 +37,8 @@
 	kconfig \
 	mod
 
+OUTDIR = scripts
+
 VPATH = $(top_srcdir)/kbuild/scripts
 
-include Makefile.inc
+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	Sun Feb 22 14:05:13 2009
@@ -2,7 +2,7 @@
 	docproc \
 	fixdep
 
-OUTDIR = basic
+OUTDIR = scripts/basic
 VPATH = $(top_srcdir)/kbuild/scripts/basic
 
-include ../Makefile.inc
+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	Sun Feb 22 14:05:13 2009
@@ -1,6 +1,6 @@
 PROGS = genksyms
 
-OUTDIR = genksyms
+OUTDIR = scripts/genksyms
 VPATH = $(top_srcdir)/kbuild/scripts/genksyms
 
 CFLAGS += -I$(top_srcdir)/kbuild/scripts/genksyms
@@ -15,4 +15,4 @@
 %.h: %.h_shipped
 	ln -s $< $@
 
-include ../Makefile.inc
+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	Sun Feb 22 14:05:13 2009
@@ -1,6 +1,6 @@
 PROGS = conf
 
-OUTDIR = kconfig
+OUTDIR = scripts/kconfig
 VPATH = $(top_srcdir)/kbuild/scripts/kconfig
 
 CFLAGS += -I$(top_srcdir)/kbuild/scripts/kconfig
@@ -15,4 +15,4 @@
 %.h: %.h_shipped
 	ln -sf $< $@
 
-include ../Makefile.inc
+include $(top_srcdir)/Makefile.inc

Modified: dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile	(original)
+++ dists/trunk/linux-kbuild-2.6/scripts/mod/Makefile	Sun Feb 22 14:05:13 2009
@@ -5,7 +5,7 @@
 	modpost.real-msb-32 \
 	modpost.real-msb-64
 
-OUTDIR = mod
+OUTDIR = scripts/mod
 
 modpost.real-%:
 	$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod
@@ -13,7 +13,7 @@
 %: %.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
 
-include ../Makefile.inc
+include $(top_srcdir)/Makefile.inc
 
 clean:
 	rm $(PROGS) *.o

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	Sun Feb 22 14:05:13 2009
@@ -2,7 +2,7 @@
 
 CFLAGS += -I$(top_srcdir)/kbuild/include
 
-include ../Makefile.inc
+include $(top_srcdir)/Makefile.inc
 
 modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^