[Commits] (vajda) - removed bogus build target which caused the build to be done twice when the default target was used.

commits at osafoundation.org commits at osafoundation.org
Fri Aug 20 16:43:22 PDT 2004


Commit by: vajda
Modified files:
external/Makefile 1.41 1.42

Log message:
  - removed bogus build target which caused the build to be done twice when the default target was used.
  - fixed bug 1742


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.41&r2=text&tr2=1.42

Index: external/Makefile
diff -u external/Makefile:1.41 external/Makefile:1.42
--- external/Makefile:1.41	Thu Aug 19 16:56:07 2004
+++ external/Makefile	Fri Aug 20 16:43:21 2004
@@ -51,12 +51,15 @@
 sources-$(VERSION).tar:
 	curl -O http://builds.o11n.org/external/sources-$(VERSION).tar
 
-expand: env sources-$(VERSION).tar
+sources-$(VERSION)-expanded: sources-$(VERSION).tar
 	tar xvf sources-$(VERSION).tar
 	for system in $(SYSTEMS); \
 	do \
 	    $(MAKE) -C $$system expand; \
 	done
+	touch sources-$(VERSION)-expanded
+
+expand: env sources-$(VERSION)-expanded
 
 binaries:
 	rm -f $(SNAP)-$(VERSION).tar $(SNAP)-$(VERSION).tar.gz
@@ -79,7 +82,7 @@
 $(SYSTEMS):
 	$(MAKE) -C $@ DEBUG=$(DEBUG)
 
-all: env $(SYSTEMS)
+all: env sources-$(VERSION)-expanded $(SYSTEMS)
 
 clean: env
 	@for system in $(SYSTEMS); \
@@ -88,7 +91,7 @@
 	done
 
 realclean:
-	rm -rf release debug
+	rm -rf release debug sources-$(VERSION)-expanded
 	@for system in $(SYSTEMS); \
 	do \
 	    echo making _realclean in $$system; \
@@ -106,9 +109,3 @@
 	rm -f cvsco.log;\
 	cvs co chandler-all 2>&1 | tee -a cvsco.log; \
 	echo 'Do |grep "^C " ../cvsco.log| to check for potential conflicts'
-
-build:
-	@for system in $(SYSTEMS); \
-	do \
-		$(MAKE) -C $$system DEBUG=$(DEBUG); \
-	done



More information about the Commits mailing list