ttls chbind: update VSA to use

[freeradius.git] / scripts / boiler.mk

diff --git a/scripts/boiler.mk b/scripts/boiler.mk
index b150b1c..521a975 100644 (file)
--- a/scripts/boiler.mk
+++ b/scripts/boiler.mk
@@ -80,25 +80,25 @@ define FILTER_DEPENDS
        @mkdir -p $$(dir $${BUILD_DIR}/make/src/$$*)
        @mkdir -p $$(dir $${BUILD_DIR}/objs/$$*)
        @sed  -e 's/#.*//' \
+         -e 's,^$${top_srcdir},$$$${top_srcdir},' \
+         -e 's, $${top_srcdir}, $$$${top_srcdir},' \
+         -e 's,^$${BUILD_DIR},$$$${BUILD_DIR},' \
+         -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
+         -e 's, $${BUILD_DIR}, $$$${BUILD_DIR},' \
          -e 's, /[^: ]*,,g' \
          -e 's,^ *[^:]* *: *$$$$,,' \
          -e '/: </ d' \
          -e 's/\.o: /.$$$${OBJ_EXT}: /' \
          -e '/^ *\\$$$$/ d' \
-         -e 's,^$${BUILD_DIR},$$$${BUILD_DIR},' \
-         -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
-         -e 's, $${BUILD_DIR}, $$$${BUILD_DIR},' \
-         -e '/^$$$$/ d' \
          < $${BUILD_DIR}/objs/$$*.d | sed -e '$$$$!N; /^\(.*\)\n\1$$$$/!P; D' \
          >  $${BUILD_DIR}/make/src/$$*.mk
        @sed -e 's/#.*//' \
+         -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
          -e 's, /[^: ]*,,g' \
          -e 's,^ *[^:]* *: *$$$$,,' \
          -e '/: </ d' \
-         -e 's, $${BUILD_DIR}/make/include/[^ :]*,,' \
          -e 's/^[^:]*: *//' \
          -e 's/ *\\$$$$//' \
-         -e '/^$$$$/ d' \
          -e 's/$$$$/ :/' \
          < $${BUILD_DIR}/objs/$$*.d | sed -e '$$$$!N; /^\(.*\)\n\1$$$$/!P; D' \
         >> $${BUILD_DIR}/make/src/$$*.mk
@@ -177,7 +177,7 @@ define ADD_TARGET_RULE.exe
     # Create executable ${1}
     $${${1}_BUILD}/${1}: $${${1}_OBJS} $${${1}_PRBIN} $${${1}_PRLIBS}
            @$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
-           @echo LINK $${${1}_BUILD}/${1}
+           @$(ECHO) LINK $${${1}_BUILD}/${1}
            @$${${1}_LINKER} -o $${${1}_BUILD}/${1} $${RPATH_FLAGS} $${LDFLAGS} \
                 $${${1}_LDFLAGS} $${${1}_OBJS} $${${1}_PRLIBS} \
                 $${LDLIBS} $${${1}_LDLIBS}
@@ -197,7 +197,7 @@ define ADD_TARGET_RULE.a
     # Create static library ${1}
     $${${1}_BUILD}/${1}: $${${1}_OBJS} $${${1}_PREREQS}
            @$(strip mkdir -p $(dir $${${1}_BUILD}/${1}))
-           @echo LINK $${${1}_BUILD}/${1}
+           @$(ECHO) LINK $${${1}_BUILD}/${1}
            @$${AR} $${ARFLAGS} $${${1}_BUILD}/${1} $${${1}_OBJS}
            @$${${1}_POSTMAKE}
 
@@ -240,7 +240,7 @@ endef
 # COMPILE_C_CMDS - Commands for compiling C source code.
 define COMPILE_C_CMDS
        @mkdir -p $(dir $@)
-       @echo CC $<
+       @$(ECHO) CC $<
        @$(strip ${COMPILE.c} -o $@ -c -MD ${CFLAGS} ${SRC_CFLAGS} ${INCDIRS} \
            ${SRC_INCDIRS} ${SRC_DEFS} ${DEFS} $<)
 endef
@@ -524,6 +524,9 @@ CPP = cc -E
 LINK.c = ${CC}
 LINK.cxx = ${CXX}
 
+# Set ECHO to "true" for *very* quiet builds
+ECHO = echo
+
 # Define the "all" target (which simply builds all user-defined targets) as the
 # default goal.
 .PHONY: all