Use $(MAKE) instead of make
This commit is contained in:
parent
6716f4c9dc
commit
acd31d066f
4
Makefile
4
Makefile
@ -273,11 +273,11 @@ test: unittest systemtest
|
||||
|
||||
.PHONY: unittest
|
||||
unittest:
|
||||
make -C test $@
|
||||
+$(MAKE) -C test $@
|
||||
|
||||
.PHONY: systemtest
|
||||
systemtest:
|
||||
make -C test $@
|
||||
$(MAKE) -C test $@
|
||||
|
||||
test_parser: $(OBJS) test_parser.o Makefile
|
||||
$(CXX) $(DEFS) $(CPPFLAGS) -o $@ test_parser.o $(OBJS) $(LIBS)
|
||||
|
@ -5,13 +5,13 @@ test: unittest systemtest
|
||||
|
||||
.PHONY: unittest
|
||||
unittest:
|
||||
make -C unit test
|
||||
$(MAKE) -C unit test
|
||||
|
||||
.PHONY: systemtest
|
||||
systemtest:
|
||||
make -C system test
|
||||
$(MAKE) -C system test
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
make -C unit $@
|
||||
make -C system $@
|
||||
$(MAKE) -C unit $@
|
||||
$(MAKE) -C system $@
|
||||
|
@ -20,13 +20,13 @@ all: $(TARGET)
|
||||
|
||||
.PHONY: libgb.a
|
||||
libgb.a:
|
||||
make -C $(BASE_DIR) libgb.a
|
||||
$(MAKE) -C $(BASE_DIR) libgb.a
|
||||
|
||||
ucdata:
|
||||
ln -s $(BASE_DIR)/$@ .
|
||||
|
||||
$(BASE_DIR)/libcld2_full.so:
|
||||
make -C $(BASE_DIR) libcld2_full.so
|
||||
$(MAKE) -C $(BASE_DIR) libcld2_full.so
|
||||
|
||||
libgtest.so:
|
||||
cd $(GTEST_DIR) && cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Debug && make
|
||||
|
Loading…
Reference in New Issue
Block a user