Code Review
/
genesis.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tidied up the last references to ODL
[genesis.git]
/
fuel
/
build
/
Makefile
diff --git
a/fuel/build/Makefile
b/fuel/build/Makefile
index
086839d
..
4714aed
100644
(file)
--- a/
fuel/build/Makefile
+++ b/
fuel/build/Makefile
@@
-108,10
+108,6
@@
$(SUBDIRS):
patch-packages:
ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
patch-packages:
ORIGISO=$(ISOCACHE) REVSTATE=$(REVSTATE) $(MAKE) -C $@ -f Makefile release
-.PHONY: prepare
-prepare:
- #$(MAKE) -C opendaylight -f Makefile setup
-
.PHONY: build-clean $(SUBCLEAN)
build-clean: $(SUBCLEAN)
$(MAKE) -C patch-packages -f Makefile clean
.PHONY: build-clean $(SUBCLEAN)
build-clean: $(SUBCLEAN)
$(MAKE) -C patch-packages -f Makefile clean
@@
-120,9
+116,8
@@
build-clean: $(SUBCLEAN)
@rm -f $(NEWISO)
.PHONY: clean $(SUBCLEAN)
@rm -f $(NEWISO)
.PHONY: clean $(SUBCLEAN)
-clean: clean-cache
prepare
$(SUBCLEAN)
+clean: clean-cache $(SUBCLEAN)
$(MAKE) -C patch-packages -f Makefile clean
$(MAKE) -C patch-packages -f Makefile clean
- #$(MAKE) -C opendaylight -f Makefile clean
@rm -f *.iso
@rm -Rf release
@rm -Rf newiso
@rm -f *.iso
@rm -Rf release
@rm -Rf newiso
@@
-135,7
+130,7
@@
$(SUBCLEAN): %.clean:
# Todo: Make things smarter - we shouldn't need to clean everything
# betwen make invocations.
.PHONY: iso
# Todo: Make things smarter - we shouldn't need to clean everything
# betwen make invocations.
.PHONY: iso
-iso:
prepare
build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
+iso: build-clean $(ISOCACHE) $(SUBDIRS) patch-packages
install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
@printf "\n\nProduct ISO is $(NEWISO)\n\n"
install/install.sh iso $(ISOCACHE) $(NEWISO) $(PRODNO) $(REVSTATE)
@printf "\n\nProduct ISO is $(NEWISO)\n\n"