Skip to content

Commit

Permalink
Move introspectors back into components, part of combining into more …
Browse files Browse the repository at this point in the history
…flexible

framework
  • Loading branch information
Brian Barrett committed May 12, 2010
1 parent f89e6ed commit a4aa8df
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 532 deletions.
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ EXTRA_DIST = autogen.sh

SUBDIRS = \
components \
introspectors \
sst \
doc \
user_includes \
Expand Down
32 changes: 0 additions & 32 deletions autogen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,6 @@ for component_dir in components/* ; do
fi
done

echo "Finding introspectors ..."
introspector_list=
introspector_m4_list=
for introspector_dir in introspectors/* ; do
if test -d "$introspector_dir" ; then
introspector=`basename "$introspector_dir"`
if test -f "$introspector_dir/.ignore" -a ! -f "$introspector_dir/.unignore" ; then
echo " - ignoring introspector $introspector"
elif test -f "$introspector_dir/.ignore" && \
test -s $introspector_dir/.unignore && \
test -z "`grep $USER $introspector_dir/.unignore`" ; then
echo " - ignoring introspector $introspector"
else
if test -z "$introspector_list" ; then
introspector_list="$introspector"
else
introspector_list="$introspector_list, $introspector"
fi
if test -f "$introspector_dir/configure.m4" ; then
introspector_m4_list="$introspector_m4_list $introspector_dir/configure.m4"
fi
fi
fi
done


cat > "config/sst_m4_config_include.m4" <<EOF
dnl -*- Autoconf -*-
Expand All @@ -84,12 +58,6 @@ for component in $component_m4_list ; do
echo "m4_include($component)" >> config/sst_m4_config_include.m4
done

echo "m4_define([sst_introspector_list], [$introspector_list])" >> config/sst_m4_config_include.m4
for introspector in $introspector_m4_list ; do
echo "m4_include($introspector)" >> config/sst_m4_config_include.m4
done


echo "Generating configure files ..."
if test $major_version -lt 2 ; then
echo " - Using Libtool pre-2.0"
Expand Down
11 changes: 0 additions & 11 deletions introspectors/Makefile.am

This file was deleted.

13 changes: 0 additions & 13 deletions introspectors/introspector_cpu/Makefile.am

This file was deleted.

121 changes: 0 additions & 121 deletions introspectors/introspector_cpu/introspector_cpu.cc

This file was deleted.

149 changes: 0 additions & 149 deletions introspectors/introspector_cpu/introspector_cpu.h

This file was deleted.

10 changes: 0 additions & 10 deletions introspectors/introspector_cpuTemperature/Makefile.am

This file was deleted.

Loading

0 comments on commit a4aa8df

Please sign in to comment.