- add per-package "clean" target: "make <name>-clean" or "make

  package=<name> clean"
- add initscripts and e2fsprogs

diff --git a/Makefile b/Makefile
index e57c8a2..e9823b0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makefile,v 1.20 2004/04/12 17:52:34 alk-pl_rpm Exp $
+# $Id: Makefile,v 1.21 2004/04/12 18:13:11 alk-pl_rpm Exp $
 #
 
 # Default target
@@ -158,6 +158,28 @@ ALL += vsh
 # Build kernel-planetlab first so we can bootstrap off of its build
 vsh: kernel-planetlab
 
+#
+# e2fsprogs
+#
+
+e2fsprogs-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+e2fsprogs-INITIAL := e2fsprogs-1_33
+e2fsprogs-TAG := HEAD
+e2fsprogs-MODULE := e2fsprogs
+e2fsprogs-SPEC := e2fsprogs/e2fsprogs.spec
+ALL += e2fsprogs
+
+#
+# initscripts
+#
+
+initscripts-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+initscripts-INITIAL := initscripts-7_14
+initscripts-TAG := HEAD
+initscripts-MODULE := initscripts
+initscripts-SPEC := initscripts/initscripts.spec
+ALL += initscripts
+
 #
 # yum
 #
@@ -310,7 +332,15 @@ all: $(ALL)
 $(ALL):
        $(MAKE) package=$@
 
-.PHONY: all $(ALL)
+# Remove files generated by this package
+$(foreach package,$(ALL),$(package)-clean): %-clean:
+       $(MAKE) package=$* clean
+
+# Remove all generated files
+clean:
+       rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
+
+.PHONY: all $(ALL) clean
 
 else
 
@@ -327,8 +357,4 @@ include Makerules
 
 endif
 
-# Remove generated files
-clean:
-       rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
-
 .PHONY: clean