Merge branch 'tracecut'

Conflicts:
	src/Makefile.am

diff --cc Doxyfile
Simple merge

diff --cc src/Makefile.am
index 98512eca79d91e8e57ef7ab46b2adba438ecae33,f8a359ba209e85c494e919422628ff438af2484c..134db1497f384c979af122fa42f48de2d33ee6a0
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -6,6 -8,7 +8,11 @@@ libinteraspect_la_CFLAGS = -Wall -Werro
  libinteraspect_la_LDFLAGS = -static -prefer-pic -version-info 1:0:0
  libinteraspect_la_CPPFLAGS = -DHAVE_CONFIG_H -DIN_GCC -I$(gcc_includes)
  
 +# This file needs to be around for Doxygen but does not get compiled
 +# into the source.
 +dist_noinst_DATA = aop-doxy-main.c
++
+ libtracecut_la_SOURCES = tracecut-advice.c nfa.c nfa.h
+ libtracecut_la_CFLAGS = -Wall -Werror -fvisibility=hidden
+ 
+ include_HEADERS = aop.h tracecut.h tracecut-advice.h

diff --cc test/Makefile.am
index 84243539884b5648fe0517737f1be5117918fac9,bd445e0cf26038ab73a7795809ab24394bd57dfb..e015f45fa3b110e7c73b50647c96011cbbfa22e4
--- 1/test/Makefile.am
--- 2/test/Makefile.am
+++ b/test/Makefile.am
@@@ -4,29 -4,5 +4,29 @@@ TESTS_ENVIRONMENT = $(PYTHON) $(srcdir)
        --with-ia-src-dir=$(top_srcdir) --with-tests-dir=$(srcdir)
  TESTS = int-types.xml float-types.xml pointer-types.xml struct-types.xml \
        reinst.xml noinstrument.xml duplicate.xml inparam.xml constants.xml \
-       return.xml
+       return.xml cast.xml tracecut.xml
  endif
 +
 +dist_noinst_SCRIPTS = run-testcase.py
 +
 +# Unfortunately, we must also list each test file here to make sure it
 +# gets included in the distributed tarball.  I originally used
 +# dist_noinst_DATA for all the source files, but that didn't work.
 +dist_noinst_DATA = testcase.dtd int-types.xml float-types.xml pointer-types.xml \
 +      struct-types.xml reinst.xml noinstrument.xml duplicate.xml inparam.xml \
 +      constants.xml return.xml cast.xml tracecut.xml \
 +      test-driver.c test-driver.h \
 +      plugin-int-types.c int-types-target.c int-types-hooks.c \
 +      plugin-float-types.c float-types-target.c float-types-hooks.c \
 +      plugin-pointer-types.c pointer-types-target.c pointer-types-hooks.c \
 +      plugin-struct-types.c struct-types-target.c struct-types-hooks.c \
 +      plugin-reinst1.c plugin-reinst2.c plugin-reinst-dup.c reinst-target.c \
 +      reinst-hooks.c reinst-dup-hooks.c reinst-dup-target.c \
 +      plugin-noinstrument.c noinstrument-target.c noinstrument-hooks.c \
 +      plugin-duplicate.c duplicate-target.c duplicate-hooks.c \
 +      plugin-inparam.c plugin-allpc-inparam.c inparam-target.c \
 +      inparam-hooks.c allpc-inparam-target.c allpc-inparam-hooks.c \
 +      plugin-constants.c constants-target.c constants-hooks.c \
 +      plugin-return.c return-target.c return-hooks.c \
 +      plugin-cast.c cast-target.c cast-hooks.c \
 +      plugin-tracecut.c tracecut-target.c tracecut-hooks.c