From d866a378dbc4645d224f06dfd41c5ca793690e81 Mon Sep 17 00:00:00 2001
From: nima <nima@abc39116-655e-4be6-ad55-d661dc543056>
Date: Mon, 22 Dec 2008 22:40:51 +0000
Subject: Applied the nice changes suggested by Piotr Ożarowsk.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://svn.autonomy.net.au/python-dmidecode@164 abc39116-655e-4be6-ad55-d661dc543056
---
 Makefile | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 62869c5..a85a2ee 100644
--- a/Makefile
+++ b/Makefile
@@ -41,11 +41,12 @@ build: $(PY)-dmidecode.so
 $(PY)-dmidecode.so: $(SO)
 	cp $< $@
 
+build: $(SO)
 $(SO):
 	$(PY) src/setup.py build
 
 install:
-	$(PY) src/setup.py uninstall
+	$(PY) src/setup.py install
 
 uninstall:
 	$(PY) src/setup.py uninstall
@@ -58,10 +59,14 @@ clean :
 
 ###############################################################################
 #. Debian
-.srcsrv: $(SRCSRV)/$(PACKAGE)/$(PACKAGE)_$(VERSION).orig.tar.gz
-$(SRCSRV)/$(PACKAGE)/$(PACKAGE)_$(VERSION).orig.tar.gz: ../$(PACKAGE)_$(VERSION).orig.tar.gz
-	cp $< $@
+all: source binary
 
+source: debian orig.tar.gz
+	cp ../tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz ../$(PACKAGE)_$(VERSION).orig.tar.gz
+	debuild -S -sa -i
+	mv ../$(PACKAGE)_$(VERSION)* ../sources
+	lintian --verbose -iI ../sources/$(PACKAGE)_$(VERSION)-1_source.changes
+	scp ../sources/$(PACKAGE)_$(VERSION).orig.tar.gz nima@src.autonomy.net.au:/var/www/nima/sites/src.autonomy.net.au/pub/$(PACKAGE)/
 orig.tar.gz: ../tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz
 ../tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz: clean .
 	cd .. && tar czvf tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz \
@@ -69,7 +74,7 @@ orig.tar.gz: ../tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz
 	  --exclude debian \
 	  --exclude redhat \
 	  --exclude private \
-	  $(PACKAGE)
+	  $(PACKAGE)-$(VERSION)
 	  touch $@
 
 binary: debian orig.tar.gz
@@ -78,13 +83,6 @@ binary: debian orig.tar.gz
 	lintian --verbose  -c ../build-area/$(PACKAGE)_$(VERSION)-1_i386.deb
 	lintian --verbose -iI ../build-area/$(PACKAGE)_$(VERSION)-1_i386.changes
 
-source: debian orig.tar.gz
-	cp ../tarballs/$(PACKAGE)_$(VERSION).orig.tar.gz ../$(PACKAGE)_$(VERSION).orig.tar.gz
-	debuild -S -sa -i
-	mv ../$(PACKAGE)_$(VERSION)* ../sources
-	lintian --verbose -iI ../sources/$(PACKAGE)_$(VERSION)-1_source.changes
-	scp ../sources/$(PACKAGE)_$(VERSION).orig.tar.gz nima@ntrust.net.au:/var/www/nima/sites/src.autonomy.net.au/pub/$(PACKAGE)/
-
 dupload: debian source
 	cd ../sources && dupload -t mentors $(PACKAGE)_$(VERSION)-1_source.changes
 
@@ -110,5 +108,5 @@ $(OBJ_D)/dmioem.o: dmioem.c types.h dmidecode.h dmioem.h
 
 
 ###############################################################################
-.PHONY: install clean uninstall module build dupload
-.PHONY: binary source orig.tar.gz
+.PHONY: install clean uninstall build dupload
+.PHONY: srcsrv binary source orig.tar.gz all
-- 
cgit