From 923bee3fb2dfd02e2691cb25893be2eff5562d39 Mon Sep 17 00:00:00 2001 From: "Mike D. Lowis" Date: Wed, 6 Jun 2012 15:44:43 -0400 Subject: [PATCH] Made the makefile less verbose --- Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index fe8b590..45eae0c 100644 --- a/Makefile +++ b/Makefile @@ -76,33 +76,36 @@ all: release test release: $(SHARED_NAME) $(STATIC_NAME) test: $(TEST_RUNNER) - ./$(TEST_RUNNER) - -foo: - echo $(SRC_DEPS) + @echo Running unit tests... + @./$(TEST_RUNNER) # Binaries $(SHARED_NAME): $(SRC_OBJS) - $(CXX) $(CXXFLAGS) -shared -o $@ $(SRC_OBJS) $(LIBS) + @echo Linking $@... + @$(CXX) $(CXXFLAGS) -shared -o $@ $(SRC_OBJS) $(LIBS) $(STATIC_NAME): $(SRC_OBJS) - $(AR) $(ARFLAGS) -o $@ $(SRC_OBJS) $(LIBS) + @echo Linking $@... + @$(AR) $(ARFLAGS) -o $@ $(SRC_OBJS) $(LIBS) $(TEST_RUNNER): unit_test_pp $(SRC_OBJS) $(TEST_OBJS) - $(CXX) $(TEST_CXXFLAGS) -o $@ $(SRC_OBJS) $(TEST_OBJS) $(TEST_LIBS) + @echo Linking $@... + @$(CXX) $(TEST_CXXFLAGS) -o $@ $(SRC_OBJS) $(TEST_OBJS) $(TEST_LIBS) # Libraries unit_test_pp: - $(MAKE) -C tools/UnitTest++ + @$(MAKE) -C tools/UnitTest++ # Object Files $(SRC_OBJS): %.o : %.$(SRC_EXT) + @echo $< @$(call make-depend,$<,$@) - $(CXX) -c $(CXXFLAGS) -o $@ $< + @$(CXX) -c $(CXXFLAGS) -o $@ $< $(TEST_OBJS): %.o : %.$(TEST_EXT) + @echo $< @$(call make-depend,$<,$@) - $(CXX) -c $(TEST_CXXFLAGS) -o $@ $< + @$(CXX) -c $(TEST_CXXFLAGS) -o $@ $< # Cleanup clean: -- 2.55.0