summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-15 22:10:08 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2009-09-15 22:10:08 +0000
commitffe6f4791eb588524f3c121cf59e1d60adaffa3c (patch)
tree68917070b97a723e20a340dbf22472c6b21c8fd4 /Makefile
parentae48b5a3cfcae02b999f3224e742e995f6575cf3 (diff)
2009-09-15 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile: Add merge-helpers.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index c325498..bdee905 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,17 @@
all:
make -C sim-scripts
make -C cvs-helpers
+ make -C merge-helpers
install:
make -C sim-scripts install
make -C cvs-helpers install
+ make -C merge-helpers install
clean:
make -C sim-scripts clean
make -C cvs-helpers clean
+ make -C merge-helpers clean
rm -rf bin
up: