only build CGC tools when --enable-cgc specified

Former-commit-id: 4d54a2573dd34b05bbe59c9134fc031be3ba176f

.gitattributes

@@ -534,7 +534,7 @@ third_party/do_bea_update.sh -text
 third_party/elfio-2.2.tar.gz -text
 third_party/elfio.hpp -text
 third_party/sqlite-autoconf-3071300.tar.gz -text
-tools/Makefile -text
+tools/Makefile.in -text
 tools/cgclibc/Makefile -text
 tools/cgclibc/cgclibc.cpp -text
 tools/cgclibc/cgclibc.hpp -text

configure

@@ -565,6 +565,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 LD
 CXX
+BUILD_CGC
 EXTRA_CXXFLAGS
 target_alias
 host_alias
@@ -1664,13 +1665,15 @@ LD=g++
 
 if test "$enable_cgc" = yes; then
 	EXTRA_CXXFLAGS=-DCGC
+	BUILD_CGC="yes"
 fi
 
 
 
 
 
-ac_config_files="$ac_config_files tools/watch_syscall/Makefile tools/transforms/Makefile libIRDB/src/syscall/Makefile libIRDB/test/Makefile"
+
+ac_config_files="$ac_config_files tools/Makefile tools/watch_syscall/Makefile tools/transforms/Makefile libIRDB/src/syscall/Makefile libIRDB/test/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -2389,6 +2392,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
+    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
     "tools/watch_syscall/Makefile") CONFIG_FILES="$CONFIG_FILES tools/watch_syscall/Makefile" ;;
     "tools/transforms/Makefile") CONFIG_FILES="$CONFIG_FILES tools/transforms/Makefile" ;;
     "libIRDB/src/syscall/Makefile") CONFIG_FILES="$CONFIG_FILES libIRDB/src/syscall/Makefile" ;;

configure.in

@@ -8,13 +8,16 @@ LD=g++
 
 if test "$enable_cgc" = yes; then 
 	EXTRA_CXXFLAGS=-DCGC
+	BUILD_CGC="yes"
 fi
 
 AC_SUBST(EXTRA_CXXFLAGS)
+AC_SUBST(BUILD_CGC)
 AC_SUBST(CXX)
 AC_SUBST(LD)
 
-AC_OUTPUT(tools/watch_syscall/Makefile
+AC_OUTPUT(tools/Makefile
+	tools/watch_syscall/Makefile
 	tools/transforms/Makefile
 	libIRDB/src/syscall/Makefile
 	libIRDB/test/Makefile

tools/Makefile → tools/Makefile.in

+DIRS=safefr transforms spasm meds2pdb cover ret_shadow_stack selective_cfi 
+CGC_DIRS=cgclibc inferfn cinderella watch_syscall
 
-
-DIRS=safefr transforms spasm meds2pdb cover ret_shadow_stack selective_cfi cgclibc inferfn cinderella watch_syscall
+BUILD_CGC=@BUILD_CGC@
 
 all:
-	for i in $(DIRS); do cd $$i; make all; cd ..; done
+	for i in $(DIRS); do cd $$i; make all;  cd ..;done
+	if [ $(BUILD_CGC) ]; then for i in $(CGC_DIRS); do cd $$i; make all; cd ..; done; fi
 
 clean:
 	for i in $(DIRS); do cd $$i; make clean;  cd ..;done
+	if [ $(BUILD_CGC) ]; then for i in $(CGC_DIRS); do cd $$i; make clean; cd ..; done; fi