Skip to content

Commit

Permalink
Merge pull request #7 from emaste/master
Browse files Browse the repository at this point in the history
Use $(MAKE) to invoke sub-makes
  • Loading branch information
haberman committed Nov 8, 2016
2 parents 19a817f + 8d11f91 commit 83fe66b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ src/macho.o: src/macho.cc src/bloaty.h $(RE2_H)
src/main.o: src/main.cc src/bloaty.h $(RE2_H)

third_party/re2/obj/libre2.a: third_party/re2/Makefile
make -C third_party/re2 CPPFLAGS="-ffunction-sections -fdata-sections -g"
$(MAKE) -C third_party/re2 CPPFLAGS="-ffunction-sections -fdata-sections -g"

third_party/re2/Makefile $(RE2_H) third_party/googletest/CMakeLists.txt: .gitmodules
git submodule init && git submodule update

clean:
rm -f bloaty src/*.o src/libbloaty.a
rm -f tests/range_map_test tests/bloaty_test
cd third_party/re2 && make clean
cd third_party/re2 && $(MAKE) clean
rm -rf *.dSYM

## Tests #######################################################################
Expand All @@ -53,4 +53,4 @@ tests/bloaty_test: tests/bloaty_test.cc src/libbloaty.a $(TESTLIBS) third_party/
$(CXX) $(CXXFLAGS) $(TESTFLAGS) -o $@ $^ -lpthread

third_party/googletest/googlemock/gtest/libgtest_main.a: third_party/googletest/CMakeLists.txt
cd third_party/googletest && cmake . && make
cd third_party/googletest && cmake . && $(MAKE)

0 comments on commit 83fe66b

Please sign in to comment.