rpms/systemtap/FC-4 Makefile,1.4,1.5

[fedora-cvs-commits at redhat.com]

Author: roland

Update of /cvs/dist/rpms/systemtap/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv3185

Modified Files:
	Makefile 
Log Message:
Tweak import-systemtap target.



Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/systemtap/FC-4/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	15 Aug 2005 06:55:52 -0000	1.4
+++ Makefile	26 Aug 2005 22:43:05 -0000	1.5
@@ -13,14 +13,23 @@
 commit-check = cvs -Q diff --brief > /dev/null 2>&1
 endif
 
-import-systemtap: $(tarball) ../../elfutils/devel/sources
+elfutils-version := $(shell awk '$$2 == "elfutils_version" { print $$3 }' \
+				systemtap.spec)
+eu-dir = ../../elfutils/devel
+$(eu-dir)/elfutils.spec: FORCE
+	cd $(@D) && cvs -Q update && $(commit-check)
+$(eu-dir)/%.tar.gz: $(eu-dir)/elfutils.spec
+	$(MAKE) -C $(@D) sources
+$(eu-dir)/%.patch: $(eu-dir)/elfutils.spec ;
+
+import-systemtap: $(tarball) $(addprefix $(eu-dir)/,\
+					 elfutils-$(elfutils-version).tar.gz \
+					 elfutils-portability.patch)
 	$(commit-check) systemtap.spec
-	cd ../../elfutils/devel && cvs -Q update && $(commit-check)
-	tar -zf $< -xO '*.spec' > systemtap.spec
-	ln -f ../../elfutils/devel/elfutils-*.tar.gz .
-	cp -f ../../elfutils/devel/elfutils-portability.patch .
-	cp -f ../../elfutils/devel/sources sources
-	$(MAKE) upload FILES=$(tarball)
+	tar -zf $(tarball) -xO '*.spec' > systemtap.spec
+	ln -f $(filter $(eu-dir)/%.tar.gz,$^) .
+	ln -f $(filter $(eu-dir)/%.patch,$^) .
+	$(MAKE) upload FILES='$(filter-out %.patch,$^)'
 	touch $@
 
 bundled-devel := 0