blob: 6e5cd9b5fded9215e47026f94992d486713c173a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
--- tools/rospack/Makefile.orig 2011-09-02 17:53:09.000000000 +0000
+++ tools/rospack/Makefile
@@ -10,28 +10,28 @@ all:
-mkdir -p bin
@if ! (cd build && cmake ..); then \
echo "[rosbuild] CMake failed; trying to clean and start over"; \
- make clean; \
+ $(MAKE) clean; \
mkdir -p build; \
cd build && cmake ..; \
fi
- cd build && make $(PARALLEL_JOBS)
+ cd build && $(MAKE) $(PARALLEL_JOBS)
install: all
- cd build && make install
+ cd build && $(MAKE) install
# The clean target blows everything away
clean:
- -cd build && make clean
+ -cd build && $(MAKE) clean
rm -rf build
test: all
- if cd build && make -k $@; then make test-results; else make test-results && exit 1; fi
+ if cd build && $(MAKE) -k $@; then make test-results; else $(MAKE) test-results && exit 1; fi
tests: all
- cd build && make $@
+ cd build && $(MAKE) $@
test-future: all
- cd build && make -k $@
+ cd build && $(MAKE) -k $@
gcoverage: all
- cd build && make $@
+ cd build && $(MAKE) $@
#SRC = main.cpp
#LIBSRC = rospack.cpp \
|
