Merge "Build System: Prevent unneeded changes to asterisk/buildopts.h."
authorMatt Jordan <mjordan@digium.com>
Wed, 29 Apr 2015 14:47:58 +0000 (09:47 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 29 Apr 2015 14:47:58 +0000 (09:47 -0500)
build_tools/make_buildopts_h

index df506ed..c96e508 100755 (executable)
@@ -10,6 +10,13 @@ cat << END
  */
 
 END
+
+if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
+then
+       echo "#define AST_DEVMODE 1"
+       BUILDOPTS="AST_DEVMODE"
+fi
+
 TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
        echo "#define ${x} 1"
@@ -33,18 +40,8 @@ for x in ${TMP}; do
                BUILDOPTS="${x}"
        fi
 done
-TMP=`${GREP} -e "^MENUSELECT_BUILD_DEPS" menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
-for x in ${TMP}; do
-       x2=`echo ${x} | tr a-z A-Z`
-       echo "#define AST_MODULE_${x2} 1"
-done
-if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
-then
-       echo "#define AST_DEVMODE 1"
-       TMP="${TMP} AST_DEVMODE"
-fi
 
-BUILDSUM=`echo ${TMP} | ${MD5} | cut -c1-32`
+BUILDSUM=`echo ${BUILDOPTS} | ${MD5} | cut -c1-32`
 
 echo "#define AST_BUILDOPT_SUM \"${BUILDSUM}\""
 echo "#define AST_BUILDOPTS \"${BUILDOPTS}\""