gunnar: server/pear Pear.mk,1.13,1.14

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear
In directory doto:/tmp/cvs-serv9527

Modified Files:
	Pear.mk 
Log Message:
Update the ar make helper before moving it into the make-helper directory.

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Pear.mk	22 Jul 2009 07:52:06 -0000	1.13
+++ Pear.mk	24 Dec 2009 12:34:22 -0000	1.14
@@ -130,9 +130,7 @@
 
 # Target for placing the source rpm in the staging area
 .PHONY: dist
-dist: all
-	test -d $(STAGING) || mkdir $(STAGING)
-	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
+dist: $(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 
 # Target for installing the binary rpm package in our current Kolab
 # server installation
@@ -140,10 +138,51 @@
 install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
 
+# Target for cleaning up the files that can be generated with this Makefile
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf $(SOURCE_0)
+	rm -rf *~
+	rm -rf tmp
+	rm -rf $(PACKAGE).spec
+	rm -rf package.patch
+
+# Target for fetching the source rpm into the current directory
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
+
 # Target location for the repository checkout
 $(UPSTREAM)/$(SAFE_COMMIT):
 	mkdir -p "$(UPSTREAM)/$(SAFE_COMMIT)"
 
+# Target for building the binary package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+# Target for building the source package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
+
+# Target for preparing the source area and building the package
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for the source file in the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0)
+	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/
+
+# Target for the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE):
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+
+# Target for retrieving the source package
+$(SOURCE_0):
+	wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 
 # Get the repository checkout
 ifeq ($(PACKAGE_VC),CVS)
@@ -200,17 +239,13 @@
 snapshot: tmp/.sent
 endif
 
-# Target for retrieving the source package
-$(SOURCE_0):
-	wget -c "$(SOURCE_URL)/$(SOURCE_0)"
-
-# Target for the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE):
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+# Prepare the staging area
+$(STAGING):
+	mkdir -p $(STAGING)
 
-# Target for the source file in the src rpm directory.
-$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_0)
-	cp $(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/
+# Final package location
+$(STAGING)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(STAGING) $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(STAGING)
 
 # Prepare the patch for the package.
 package.patch: $(PATCHES)
@@ -242,34 +277,4 @@
 	      -e "s#[@]description[@]#$${description}#g"       \
 	      -e "s#[@]with_chroot[@]#$(WITH_CHROOT)#g" >      \
 	  $(PACKAGE).spec
-
-# Target for preparing the source area and building the package
-$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
-	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
-
-# Target for building the binary package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
-# Target for building the source package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
-
-# Target for fetching the source rpm into the current directory
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
-
-# Target for cleaning up the files that can be generated with this Makefile
-.PHONY: clean
-clean:
-	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
-	rm -rf $(KOLABRPMSRC)/$(PACKAGE)
-	rm -rf $(KOLABRPMTMP)/$(PACKAGE)*
-	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
-	rm -rf $(SOURCE_0)
-	rm -rf *~
-	rm -rf tmp
-	rm -rf $(PACKAGE).spec
-	rm -rf package.patch