Преглед на файлове

make testprof/makefile silent

Steffen Jaeckel преди 9 години
родител
ревизия
912eff4949
променени са 2 файла, в които са добавени 21 реда и са изтрити 3 реда
  1. 1 1
      makefile
  2. 20 2
      testprof/makefile

+ 1 - 1
makefile

@@ -225,7 +225,7 @@ endif
 
 
 .PHONY: testprof/$(LIBTEST)
 .PHONY: testprof/$(LIBTEST)
 testprof/$(LIBTEST):
 testprof/$(LIBTEST):
-	CFLAGS="$(CFLAGS)" LIBTEST_S=$(LIBTEST_S) CC="$(CC)" LD="$(LD)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" RANLIB="$(RANLIB)" V="$(V)" $(MAKE) -C testprof
+	${silent} CFLAGS="$(CFLAGS)" LIBTEST_S=$(LIBTEST_S) CC="$(CC)" LD="$(LD)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" RANLIB="$(RANLIB)" V="$(V)" $(MAKE) -C testprof
 
 
 timing: library testprof/$(LIBTEST) $(TIMINGS)
 timing: library testprof/$(LIBTEST) $(TIMINGS)
 ifneq ($V,1)
 ifneq ($V,1)

+ 20 - 2
testprof/makefile

@@ -5,6 +5,18 @@ ifndef RANLIB
    RANLIB=ranlib
    RANLIB=ranlib
 endif
 endif
 
 
+ifeq ($V,1)
+silent=
+else
+silent=@
+endif
+
+%.o: %.c
+ifneq ($V,1)
+	@echo "   * ${CC} $@"
+endif
+	${silent} ${CC} ${CFLAGS} -c $< -o $@
+
 OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o                         \
 OBJECTS = base64_test.o cipher_hash_test.o der_tests.o no_prng.o                         \
 dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o       \
 dsa_test.o ecc_test.o mac_test.o misc_test.o modes_test.o pkcs_1_test.o rsa_test.o       \
 store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o                             \
 store_test.o test_driver.o x86_prof.o katja_test.o dh_test.o                             \
@@ -17,8 +29,14 @@ endif
 default: $(LIBTEST_S)
 default: $(LIBTEST_S)
 
 
 $(LIBTEST_S): $(OBJECTS)
 $(LIBTEST_S): $(OBJECTS)
-	$(AR) $(ARFLAGS) $@ $(OBJECTS)
-	$(RANLIB) $@
+ifneq ($V,1)
+	@echo "   * ${AR} $@"
+endif
+	${silent} $(AR) $(ARFLAGS) $@ $(OBJECTS)
+ifneq ($V,1)
+	@echo "   * ${RANLIB} $@"
+endif
+	${silent} $(RANLIB) $@
 
 
 clean:
 clean:
 	rm -f *.o *.a *.gcov *.gcda *.gcno
 	rm -f *.o *.a *.gcov *.gcda *.gcno