[tor-commits] [stegotorus/master] Three tiny bugfixes in the build system.

[zwol at torproject.org]

commit 542ed83ed4d63d9cee91155adf33bc93dc3d799e
Author: Zack Weinberg <zackw at cmu.edu>
Date:   Sun Jul 8 20:36:27 2012 +0200

    Three tiny bugfixes in the build system.
    
     * Use quadrigraphs for "rm -f conft[ABC].o" in ranlib.m4 so they actually
       get deleted.
     * Stop using EXTRA_*_DEPENDENCIES which autoconf 1.11 doesn't support.
     * Make the spacing of the silent-mode custom printouts match autoconf 1.12
       (purely cosmetic).
---
 Makefile.am          |   10 +++++-----
 config-aux/ranlib.m4 |    2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c275aac..42eaede 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,9 @@ nodist_libstegotorus_a_SOURCES = protolist.cc steglist.cc
 stegotorus_SOURCES = \
 	src/main.cc
 
+# prevent stegotorus from being linked if s-a-g fails
+stegotorus_DEPENDENCIES = $(LDADD) stamp-audit-globals
+
 UTGROUPS = \
 	src/test/unittest_base64.cc \
 	src/test/unittest_compression.cc \
@@ -115,11 +118,11 @@ AGLOB = $(SHELL) $(srcdir)/src/audit-globals.sh
 
 AM_V_gs   = $(AM_V_gs_$(V))
 AM_V_gs_  = $(AM_V_gs_$(AM_DEFAULT_VERBOSITY))
-AM_V_gs_0 = @echo "  GEN   " $(patsubst stamp-%,%.cc,$@);
+AM_V_gs_0 = @echo "  GEN     " $(patsubst stamp-%,%.cc,$@);
 
 AM_V_ag   = $(AM_V_ag_$(V))
 AM_V_ag_  = $(AM_V_ag_$(AM_DEFAULT_VERBOSITY))
-AM_V_ag_0 = @echo "  AGLOB ";
+AM_V_ag_0 = @echo "  AGLOB";
 
 protolist.cc: stamp-protolist ;
 stamp-protolist: $(PROTOCOLS) Makefile src/genmodtable.sh
@@ -141,9 +144,6 @@ stamp-audit-globals: src/audit-globals.sh Makefile \
 	$(AM_V_ag) $(AGLOB) $(libstegotorus_a_OBJECTS) $(stegotorus_OBJECTS)
 	$(AM_V_at) touch stamp-audit-globals
 
-# prevent stegotorus from being linked if s-a-g fails
-EXTRA_stegotorus_DEPENDENCIES = stamp-audit-globals
-
 # Testing
 check-local:
 	@echo --- Unit tests ---
diff --git a/config-aux/ranlib.m4 b/config-aux/ranlib.m4
index ce4fe33..731d320 100644
--- a/config-aux/ranlib.m4
+++ b/config-aux/ranlib.m4
@@ -59,7 +59,7 @@ if test x$RANLIB != x:; then
           [ac_cv_prog_RANLIB_necessary=yes],
           [AC_MSG_ERROR([test link failed with and without ranlib])])])
 
-     rm -f conftest$ac_exeext conft[ABC].$ac_objext conftest.a
+     rm -f conftest$ac_exeext conft@<:@ABC@:>@.$ac_objext conftest.a
      AC_LANG_POP([C])
   ])
   if test $ac_cv_prog_RANLIB_necessary = no; then