[kernel] r18282 - dists/sid/linux-latest-2.6/debian

[Ben Hutchings]

Author: benh
Date: Mon Nov 14 06:55:42 2011
New Revision: 18282

Log:
Clean up after pasting in the old included rules

Modified:
   dists/sid/linux-latest-2.6/debian/rules

Modified: dists/sid/linux-latest-2.6/debian/rules
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules	Mon Nov 14 06:52:22 2011	(r18281)
+++ dists/sid/linux-latest-2.6/debian/rules	Mon Nov 14 06:55:42 2011	(r18282)
@@ -3,6 +3,8 @@
 
 include debian/rules.defs
 
+GENCONTROL = debian/bin/gencontrol.py
+
 DEB_HOST_ARCH  := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
@@ -23,6 +25,7 @@
 	dh_testdir
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
+	find debian -maxdepth 1 -type l -delete
 
 binary-indep:
 	dh_testdir
@@ -35,8 +38,7 @@
 binary:	binary-indep binary-arch
 
 CONTROL_FILES += debian/changelog $(wildcard debian/templates/control.*) 
-CONTROL_FILES += $(wildcard debian/arch/defines) $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
-debian/control debian/rules.gen: $(CONTROL_FILES)
+debian/control debian/rules.gen: $(GENCONTROL) $(CONTROL_FILES)
 ifeq ($(wildcard debian/control.md5sum),)
 	$(MAKE) -f debian/rules debian/control-real
 else ifeq ($(__BINNMU),)
@@ -47,7 +49,7 @@
 		$(MAKE) -f debian/rules debian/control-real
 endif
 
-debian/control-real: $(CONTROL_FILES)
+debian/control-real: $(GENCONTROL) $(CONTROL_FILES)
 	$(GENCONTROL) /usr/src/linux-support-$(KERNELVERSION)
 	md5sum $^ > debian/control.md5sum
 	@echo
@@ -58,10 +60,6 @@
 	@echo
 	exit 1
 
-.PHONY: clean build binary-indep binary-arch binary
-
-GENCONTROL = debian/bin/gencontrol.py
-
 ifdef DEBIAN_KERNEL_BUILD_ANY
 binary-arch: binary-arch-all
 endif
@@ -74,9 +72,4 @@
 	-rm debian/control debian/control.md5sum debian/rules.gen
 	rm -f debian/*.bug-presubj
 
-# rules.include defines the 'clean' rule, so we add a dependency rather
-# than trying to redefine it.
-clean: clean-extra
-clean-extra:
-	find debian -maxdepth 1 -type l -delete
-.PHONY: clean-extra
+.PHONY: clean build binary-indep binary-arch binary