[pkg-nvidia-devel] r826 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog rules

[rra at users.alioth.debian.org]

Author: rra
Date: Sun Apr 25 04:30:37 2010
New Revision: 826

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=826
Log:
Clean up stamp handling in debian/rules

[ Andreas Beckmann ]
* debian/rules: rename target configure-stamp to unpack-stamp and fix
  dependencies
* debian/rules: remove unused stamp files, targets and variables

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=826&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:30:37 2010
@@ -53,6 +53,9 @@
     debian.binary/control.template
   * debian/rules: rename target build-kernel-stamp to module-source-stamp,
     reindent, simplify and unify; do not require root for building the tarball
+  * debian/rules: rename target configure-stamp to unpack-stamp and fix
+    dependencies
+  * debian/rules: remove unused stamp files, targets and variables
 
  -- Russ Allbery <rra at debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=826&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:30:37 2010
@@ -45,23 +45,10 @@
 debian.binary/changelog
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-version-change: version-clean $(AUTOGEN) clean
-
-configure: configure-stamp
-
-.PHONY: configure-stamp
-configure-stamp: version-clean $(AUTOGEN) ${filename_x86} ${filename_x86_64}
+.PHONY: configure
+configure: $(AUTOGEN) unpack-stamp
+
+unpack-stamp: ${filename_x86} ${filename_x86_64}
 	dh_testdir
 	# extract both so we can fetch the kernel object code for both arches
 	sh ${filename_x86} --extract-only
@@ -70,21 +57,14 @@
 	ln -s ${dirname_x86_64} NVIDIA-Linux-amd64
 	ln -s NVIDIA-Linux-$(DEB_BUILD_ARCH) NVIDIA-Linux
 	ls -al
-	touch configure-stamp
+	touch $@
 
 
 .PHONY: build
-build: configure-stamp build-stamp module-source-stamp
-
-.PHONY: build-stamp
-build-stamp:
-	    touch build-stamp
-
-.PHONY: build-kernel
-build-kernel:
+build: configure module-source-stamp
 
 # build kernel module source tarball
-module-source-stamp: $(AUTOGEN)
+module-source-stamp: configure
 	dh_testdir
 
 	rm -rf debian/temp
@@ -124,21 +104,22 @@
 
 
 .PHONY: clean					
-clean: version-clean
+clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp module-source-stamp configure-stamp
+	rm -f unpack-stamp module-source-stamp
 	dh_clean 
 
 	rm -f NVIDIA-Linux NVIDIA-Linux-i386 NVIDIA-Linux-amd64
 	rm -fr $(dirname_x86) $(dirname_x86_64)  nvidia-kernel.tar.bz2
 	rm -fr debian/temp
 
+	rm -f $(AUTOCLEAN)
 	$(MAKE) -f debian/rules $(AUTOKEEP)
 
 
 .PHONY: install
-install: build-stamp
+install: build
 	dh_testdir
 	dh_testroot
 	dh_prep 
@@ -285,15 +266,11 @@
 
 # Build architecture dependant packages using the common target.
 .PHONY: binary-arch
-binary-arch: build-stamp module-source-stamp install
+binary-arch: install
 	$(MAKE) -f debian/rules binary-common
 
 .PHONY: binary
 binary: binary-arch
 
-.PHONY: version-clean
-version-clean: 
-	rm -f ${AUTOCLEAN} || true
-
 .PHONY: autogen
 autogen: ${AUTOGEN}