From a78250e1bc1e8798251edcee3ad7f70f2064c6a6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 31 Jul 2011 11:18:48 +0000 Subject: [PATCH] Move imported code to root directory. svn path=/dists/trunk/linux-tools/; revision=17874 --- debian/build/Makefile.inc | 4 ++-- debian/build/scripts/Makefile | 2 +- debian/build/scripts/basic/Makefile | 2 +- debian/build/scripts/genksyms/Makefile | 2 +- debian/build/scripts/kconfig/Makefile | 2 +- debian/build/scripts/mod/Makefile | 4 ++-- debian/build/scripts/mod/Makefile.real | 2 +- debian/rules | 12 ++++++------ 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/build/Makefile.inc b/debian/build/Makefile.inc index c3e557703..72658a42f 100644 --- a/debian/build/Makefile.inc +++ b/debian/build/Makefile.inc @@ -30,7 +30,7 @@ install-local-progs: $(PROGS) install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \ done -SCRIPTS_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(SCRIPTS)) +SCRIPTS_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS)) install-local-scripts: $(SCRIPTS_REAL) @for p in $^; do \ @@ -38,7 +38,7 @@ install-local-scripts: $(SCRIPTS_REAL) install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \ done -DATA_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(DATA)) +DATA_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA)) install-local-data: $(DATA_REAL) @for p in $^; do \ diff --git a/debian/build/scripts/Makefile b/debian/build/scripts/Makefile index 1ef6f0a1e..d591c9bcc 100644 --- a/debian/build/scripts/Makefile +++ b/debian/build/scripts/Makefile @@ -45,6 +45,6 @@ OUTDIR = scripts top_srcdir = .. -VPATH = $(top_srcdir)/kbuild/scripts +VPATH = $(top_srcdir)/scripts include $(top_srcdir)/debian/build/Makefile.inc diff --git a/debian/build/scripts/basic/Makefile b/debian/build/scripts/basic/Makefile index 3aa741d04..7a5ef1c80 100644 --- a/debian/build/scripts/basic/Makefile +++ b/debian/build/scripts/basic/Makefile @@ -5,6 +5,6 @@ OUTDIR = scripts/basic top_srcdir = ../.. -VPATH = $(top_srcdir)/kbuild/$(OUTDIR) +VPATH = $(top_srcdir)/$(OUTDIR) include $(top_srcdir)/debian/build/Makefile.inc diff --git a/debian/build/scripts/genksyms/Makefile b/debian/build/scripts/genksyms/Makefile index 2debf5b09..66f5b2d4f 100644 --- a/debian/build/scripts/genksyms/Makefile +++ b/debian/build/scripts/genksyms/Makefile @@ -4,7 +4,7 @@ OUTDIR = scripts/genksyms top_srcdir = ../.. -VPATH = $(top_srcdir)/kbuild/$(OUTDIR) +VPATH = $(top_srcdir)/$(OUTDIR) include $(top_srcdir)/debian/build/Makefile.inc diff --git a/debian/build/scripts/kconfig/Makefile b/debian/build/scripts/kconfig/Makefile index d14e845f5..370db47ab 100644 --- a/debian/build/scripts/kconfig/Makefile +++ b/debian/build/scripts/kconfig/Makefile @@ -4,7 +4,7 @@ OUTDIR = scripts/kconfig top_srcdir = ../.. -VPATH = $(top_srcdir)/kbuild/$(OUTDIR) +VPATH = $(top_srcdir)/$(OUTDIR) include $(top_srcdir)/debian/build/Makefile.inc diff --git a/debian/build/scripts/mod/Makefile b/debian/build/scripts/mod/Makefile index c413590c4..5cb67d4a8 100644 --- a/debian/build/scripts/mod/Makefile +++ b/debian/build/scripts/mod/Makefile @@ -12,12 +12,12 @@ top_srcdir = ../.. include $(top_srcdir)/debian/build/Makefile.inc modpost.real-%: - $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod + $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/scripts/mod %: %.o $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -modpost.h: $(top_srcdir)/kbuild/scripts/mod/modpost.c +modpost.h: $(top_srcdir)/scripts/mod/modpost.c python ./gendef.py $< > $@ modpost.o: modpost.c modpost.h diff --git a/debian/build/scripts/mod/Makefile.real b/debian/build/scripts/mod/Makefile.real index a0979abce..d999c78de 100644 --- a/debian/build/scripts/mod/Makefile.real +++ b/debian/build/scripts/mod/Makefile.real @@ -2,7 +2,7 @@ PROGS = modpost.real-$(TYPE) top_srcdir = ../.. -CFLAGS += -I$(top_srcdir)/kbuild/include +CFLAGS += -I$(top_srcdir)/include include $(top_srcdir)/debian/build/Makefile.inc diff --git a/debian/rules b/debian/rules index fab307f2e..81eaebec3 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.* include debian/rules.defs build: debian/control $(STAMPS_DIR)/build-base -$(STAMPS_DIR)/build-base: $(STAMPS_DIR) kbuild/include/generated/autoconf.h +$(STAMPS_DIR)/build-base: $(STAMPS_DIR) include/generated/autoconf.h dh_testdir $(MAKE) -f debian/rules.gen build touch $@ @@ -21,7 +21,7 @@ $(STAMPS_DIR): # modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined # for all Debian architectures. -kbuild/include/generated/autoconf.h: +include/generated/autoconf.h: @mkdir -p $(@D) @[ -f $@ ] || touch $@ @@ -30,7 +30,7 @@ TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME))) orig: $(DIR_ORIG) - rsync --delete --link-dest=$(CURDIR)/$(DIR_ORIG)/kbuild/ -a $(DIR_ORIG)/kbuild/ kbuild + rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ . $(DIR_ORIG): ifeq ($(TAR_ORIG),) @@ -41,13 +41,13 @@ else endif maintainerclean: - -rm debian/control debian/control.md5sum debian/rules.gen - -rm -rf kbuild + rm -f debian/control debian/control.md5sum debian/rules.gen + rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*)) clean: debian/control dh_testdir make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR) - rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated + rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc include/generated dh_clean binary-indep: