From: William Cohen Date: Mon, 30 Aug 2021 18:32:57 +0000 (-0400) Subject: Update configure machinery and add files to hold Dyninst analysis X-Git-Tag: release-4.6~43 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=5ccd341eaa9d7b8b12cf2ef82f56d58b1be56784;p=systemtap.git Update configure machinery and add files to hold Dyninst analysis The analysis uses tooling in Dyninst to do the analysis. However, Dyninst is not available for some architectures. Needed to make the configuration machinery only enable the Dyninst-based analysis for supported machines such as x86-64 and aarch64. The analysis.cxx is not currently connected to anything and doesn't do any analysis. For the moment it uses a couple Dyninst functions verify that Dyninst libraries are being linked in. This has been tested to compile on both architectures that support Dyninst (x86_64) and do not support Dyninst (32-bit Arm). --- diff --git a/Makefile.am b/Makefile.am index 9264eb2af..d595cc96b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,9 +52,10 @@ stap_SOURCES = main.cxx session.cxx \ setupdwfl.cxx remote.cxx privilege.cxx cmdline.cxx \ tapset-dynprobe.cxx tapset-method.cxx translator-output.cxx \ stapregex.cxx stapregex-tree.cxx stapregex-parse.cxx \ - stapregex-dfa.cxx stringtable.cxx tapset-python.cxx + stapregex-dfa.cxx stringtable.cxx tapset-python.cxx \ + analysis.cxx noinst_HEADERS = sdt_types.h -stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ @LIBINTL@ -lpthread @debuginfod_LIBS@ +stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ @LIBINTL@ -lpthread @debuginfod_LIBS@ @DYNINST_LDFLAGS@ @DYNINST_LIBS@ stap_DEPENDENCIES = if HAVE_LIBREADLINE diff --git a/Makefile.in b/Makefile.in index 9f95972d8..de5ca2de6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -213,6 +213,7 @@ PROGRAMS = $(bin_PROGRAMS) $(pkglibexec_PROGRAMS) @BUILD_TRANSLATOR_TRUE@ stap-stapregex-dfa.$(OBJEXT) \ @BUILD_TRANSLATOR_TRUE@ stap-stringtable.$(OBJEXT) \ @BUILD_TRANSLATOR_TRUE@ stap-tapset-python.$(OBJEXT) \ +@BUILD_TRANSLATOR_TRUE@ stap-analysis.$(OBJEXT) \ @BUILD_TRANSLATOR_TRUE@ $(am__objects_1) $(am__objects_2) \ @BUILD_TRANSLATOR_TRUE@ $(am__objects_3) $(am__objects_4) \ @BUILD_TRANSLATOR_TRUE@ $(am__objects_5) @@ -322,13 +323,13 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/stap-bpf-base.Po \ - ./$(DEPDIR)/stap-bpf-bitset.Po ./$(DEPDIR)/stap-bpf-opt.Po \ - ./$(DEPDIR)/stap-bpf-translate.Po ./$(DEPDIR)/stap-buildrun.Po \ - ./$(DEPDIR)/stap-cache.Po ./$(DEPDIR)/stap-client-http.Po \ - ./$(DEPDIR)/stap-client-nss.Po ./$(DEPDIR)/stap-cmdline.Po \ - ./$(DEPDIR)/stap-coveragedb.Po ./$(DEPDIR)/stap-csclient.Po \ - ./$(DEPDIR)/stap-cscommon.Po \ +am__depfiles_remade = ./$(DEPDIR)/stap-analysis.Po \ + ./$(DEPDIR)/stap-bpf-base.Po ./$(DEPDIR)/stap-bpf-bitset.Po \ + ./$(DEPDIR)/stap-bpf-opt.Po ./$(DEPDIR)/stap-bpf-translate.Po \ + ./$(DEPDIR)/stap-buildrun.Po ./$(DEPDIR)/stap-cache.Po \ + ./$(DEPDIR)/stap-client-http.Po ./$(DEPDIR)/stap-client-nss.Po \ + ./$(DEPDIR)/stap-cmdline.Po ./$(DEPDIR)/stap-coveragedb.Po \ + ./$(DEPDIR)/stap-csclient.Po ./$(DEPDIR)/stap-cscommon.Po \ ./$(DEPDIR)/stap-dwarf_wrappers.Po ./$(DEPDIR)/stap-dwflpp.Po \ ./$(DEPDIR)/stap-elaborate.Po ./$(DEPDIR)/stap-hash.Po \ ./$(DEPDIR)/stap-interactive.Po ./$(DEPDIR)/stap-loc2stap.Po \ @@ -473,6 +474,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -632,6 +634,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ @@ -690,12 +693,14 @@ oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h @BUILD_TRANSLATOR_TRUE@ translator-output.cxx stapregex.cxx \ @BUILD_TRANSLATOR_TRUE@ stapregex-tree.cxx stapregex-parse.cxx \ @BUILD_TRANSLATOR_TRUE@ stapregex-dfa.cxx stringtable.cxx \ -@BUILD_TRANSLATOR_TRUE@ tapset-python.cxx $(am__append_7) \ -@BUILD_TRANSLATOR_TRUE@ $(am__append_9) $(am__append_14) \ -@BUILD_TRANSLATOR_TRUE@ $(am__append_15) $(am__append_21) +@BUILD_TRANSLATOR_TRUE@ tapset-python.cxx analysis.cxx \ +@BUILD_TRANSLATOR_TRUE@ $(am__append_7) $(am__append_9) \ +@BUILD_TRANSLATOR_TRUE@ $(am__append_14) $(am__append_15) \ +@BUILD_TRANSLATOR_TRUE@ $(am__append_21) @BUILD_TRANSLATOR_TRUE@noinst_HEADERS = sdt_types.h @BUILD_TRANSLATOR_TRUE@stap_LDADD = @stap_LIBS@ @sqlite3_LIBS@ \ @BUILD_TRANSLATOR_TRUE@ @LIBINTL@ -lpthread @debuginfod_LIBS@ \ +@BUILD_TRANSLATOR_TRUE@ @DYNINST_LDFLAGS@ @DYNINST_LIBS@ \ @BUILD_TRANSLATOR_TRUE@ $(am__append_8) $(am__append_13) \ @BUILD_TRANSLATOR_TRUE@ $(am__append_19) $(am__append_22) @BUILD_TRANSLATOR_TRUE@stap_DEPENDENCIES = @@ -1053,6 +1058,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-analysis.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-bpf-base.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-bpf-bitset.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stap-bpf-opt.Po@am__quote@ # am--include-marker @@ -1714,6 +1720,20 @@ stap-tapset-python.obj: tapset-python.cxx @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -c -o stap-tapset-python.obj `if test -f 'tapset-python.cxx'; then $(CYGPATH_W) 'tapset-python.cxx'; else $(CYGPATH_W) '$(srcdir)/tapset-python.cxx'; fi` +stap-analysis.o: analysis.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -MT stap-analysis.o -MD -MP -MF $(DEPDIR)/stap-analysis.Tpo -c -o stap-analysis.o `test -f 'analysis.cxx' || echo '$(srcdir)/'`analysis.cxx +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stap-analysis.Tpo $(DEPDIR)/stap-analysis.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='analysis.cxx' object='stap-analysis.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -c -o stap-analysis.o `test -f 'analysis.cxx' || echo '$(srcdir)/'`analysis.cxx + +stap-analysis.obj: analysis.cxx +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -MT stap-analysis.obj -MD -MP -MF $(DEPDIR)/stap-analysis.Tpo -c -o stap-analysis.obj `if test -f 'analysis.cxx'; then $(CYGPATH_W) 'analysis.cxx'; else $(CYGPATH_W) '$(srcdir)/analysis.cxx'; fi` +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stap-analysis.Tpo $(DEPDIR)/stap-analysis.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='analysis.cxx' object='stap-analysis.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -c -o stap-analysis.obj `if test -f 'analysis.cxx'; then $(CYGPATH_W) 'analysis.cxx'; else $(CYGPATH_W) '$(srcdir)/analysis.cxx'; fi` + stap-interactive.o: interactive.cxx @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(stap_CPPFLAGS) $(CPPFLAGS) $(stap_CXXFLAGS) $(CXXFLAGS) -MT stap-interactive.o -MD -MP -MF $(DEPDIR)/stap-interactive.Tpo -c -o stap-interactive.o `test -f 'interactive.cxx' || echo '$(srcdir)/'`interactive.cxx @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/stap-interactive.Tpo $(DEPDIR)/stap-interactive.Po @@ -2249,7 +2269,8 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -f ./$(DEPDIR)/stap-bpf-base.Po + -rm -f ./$(DEPDIR)/stap-analysis.Po + -rm -f ./$(DEPDIR)/stap-bpf-base.Po -rm -f ./$(DEPDIR)/stap-bpf-bitset.Po -rm -f ./$(DEPDIR)/stap-bpf-opt.Po -rm -f ./$(DEPDIR)/stap-bpf-translate.Po @@ -2364,7 +2385,8 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -f ./$(DEPDIR)/stap-bpf-base.Po + -rm -f ./$(DEPDIR)/stap-analysis.Po + -rm -f ./$(DEPDIR)/stap-bpf-base.Po -rm -f ./$(DEPDIR)/stap-bpf-bitset.Po -rm -f ./$(DEPDIR)/stap-bpf-opt.Po -rm -f ./$(DEPDIR)/stap-bpf-translate.Po diff --git a/analysis.cxx b/analysis.cxx new file mode 100644 index 000000000..6b1145972 --- /dev/null +++ b/analysis.cxx @@ -0,0 +1,63 @@ +// systemtap analysis code +// Copyright (C) 2021 Red Hat Inc. +// +// This file is part of systemtap, and is free software. You can +// redistribute it and/or modify it under the terms of the GNU General +// Public License (GPL); either version 2, or (at your option) any +// later version. + +#include "config.h" + +#ifdef HAVE_DYNINST + +#include +#include "analysis.h" +#include +#include +#include + +using namespace Dyninst; +using namespace SymtabAPI; +using namespace ParseAPI; +using namespace std; + + +class analysis { +public: + analysis(char *name); + SymtabCodeSource *sts; + CodeObject *co; +}; + +// Get the binary set up for anaysis +analysis::analysis(char *name) +{ + // Should see if binary already cached + sts = NULL; + co = NULL; + + // If not seen before + // Create a new binary code object from the filename argument + sts = new SymtabCodeSource(name); + return; + + co = new CodeObject(sts); + if(!co) return; +} + + +int liveness(char *executable, + Dwarf_Addr addr __attribute__ ((unused)) + /*, variable */) +{ + analysis func_to_analyze(executable); + // Find where the variable is located + // If variable isn't in a register, punt (return 0) + // Find the function containing address + // Check to see if a previous liveness information exists for function to reuse + // Otherwise create new liveness analysis + // Query to see if whether the register is live at that point + return 0; +} + +#endif // HAVE_DYNINST diff --git a/analysis.h b/analysis.h new file mode 100644 index 000000000..7ddf1927b --- /dev/null +++ b/analysis.h @@ -0,0 +1,29 @@ +// -*- C++ -*- +// Copyright (C) 2021 Red Hat Inc. +// +// This file is part of systemtap, and is free software. You can +// redistribute it and/or modify it under the terms of the GNU General +// Public License (GPL); either version 2, or (at your option) any +// later version. + +#ifndef ANALYSIS_H +#define ANALYSIS_H +#include "config.h" + +// Three outcomes of analysis: +// < 0 false +// == 0 unable to determine +// > 0 true + +#ifdef HAVE_DYNINST + +extern int liveness(char *executable, Dwarf_Addr location __attribute__ ((unused)) /*, varaccess */); + +#else + +#define liveness(executable, location, var) (0) + +#endif // HAVE_DYNINST +#endif // ANALYSIS_H + +/* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */ diff --git a/configure b/configure index 55ff87330..dde728f92 100755 --- a/configure +++ b/configure @@ -681,10 +681,11 @@ HAVE_LIBVIRT_FALSE HAVE_LIBVIRT_TRUE libvirt_LIBS libvirt_CFLAGS -HAVE_DYNINST_FALSE -HAVE_DYNINST_TRUE +DYNINST_LIBS DYNINST_LDFLAGS DYNINST_CXXFLAGS +HAVE_DYNINST_FALSE +HAVE_DYNINST_TRUE BOOST_SYSTEM_LIB CXXCPP stapbpf_LIBS @@ -870,6 +871,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -1012,6 +1014,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1264,6 +1267,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1401,7 +1413,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1554,6 +1566,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -12018,15 +12031,29 @@ if test "${with_dyninst+set}" = set; then : fi + if test "${have_dyninst}" = "yes"; then + HAVE_DYNINST_TRUE= + HAVE_DYNINST_FALSE='#' +else + HAVE_DYNINST_TRUE='#' + HAVE_DYNINST_FALSE= +fi + case "$with_dyninst" in no) ;; ''|yes) # Try a simple-minded distro search DYNINST_CXXFLAGS="-I/usr/include/dyninst" DYNINST_LDFLAGS="-L/usr/lib64/dyninst -L/usr/lib/dyninst" # XXX both lib paths!?! + # Add Dyninst libraries only if they are available + if test -d "/usr/include/dyninst"; then + DYNINST_LIBS="-l parseAPI -l symtabAPI -l instructionAPI -ltbb -lcommon" + fi ;; *) # Use paths in the user-specified prefix DYNINST_CXXFLAGS="-I$with_dyninst/include" DYNINST_LDFLAGS="-L$with_dyninst/lib/" # XXX need lib64 too? + # Will assume Dyninst libraries are available as the path is specified + DYNINST_LIBS="-l parseAPI -l symtabAPI -l instructionAPI -ltbb -lcommon" ;; esac if test "$with_dyninst" != "no"; then @@ -12051,6 +12078,7 @@ _ACEOF + $as_echo "#define HAVE_DYNINST 1" >>confdefs.h have_dyninst=yes @@ -12071,14 +12099,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi - if test "${have_dyninst}" = "yes"; then - HAVE_DYNINST_TRUE= - HAVE_DYNINST_FALSE='#' -else - HAVE_DYNINST_TRUE='#' - HAVE_DYNINST_FALSE= -fi - diff --git a/configure.ac b/configure.ac index a88c20bff..36549db9e 100644 --- a/configure.ac +++ b/configure.ac @@ -608,15 +608,22 @@ AC_ARG_WITH([dyninst], AS_HELP_STRING([--with-dyninst=DIRECTORY], [find dyninst headers/libraries in DIRECTORY])) +AM_CONDITIONAL([HAVE_DYNINST], [test "${have_dyninst}" = "yes"]) case "$with_dyninst" in no) ;; ''|yes) # Try a simple-minded distro search DYNINST_CXXFLAGS="-I/usr/include/dyninst" DYNINST_LDFLAGS="-L/usr/lib64/dyninst -L/usr/lib/dyninst" # XXX both lib paths!?! + # Add Dyninst libraries only if they are available + if test -d "/usr/include/dyninst"; then + DYNINST_LIBS="-l parseAPI -l symtabAPI -l instructionAPI -ltbb -lcommon" + fi ;; *) # Use paths in the user-specified prefix DYNINST_CXXFLAGS="-I$with_dyninst/include" DYNINST_LDFLAGS="-L$with_dyninst/lib/" # XXX need lib64 too? + # Will assume Dyninst libraries are available as the path is specified + DYNINST_LIBS="-l parseAPI -l symtabAPI -l instructionAPI -ltbb -lcommon" ;; esac if test "$with_dyninst" != "no"; then @@ -627,6 +634,7 @@ if test "$with_dyninst" != "no"; then AC_CHECK_HEADERS([BPatch_object.h], [ AC_SUBST(DYNINST_CXXFLAGS) AC_SUBST(DYNINST_LDFLAGS) + AC_SUBST(DYNINST_LIBS) AC_DEFINE([HAVE_DYNINST],[1],[Define to 1 if Dyninst is enabled]) have_dyninst=yes AC_MSG_NOTICE([dyninst support available])]) @@ -636,7 +644,6 @@ if test "$with_dyninst" != "no"; then CPPFLAGS="$old_CPPFLAGS" AC_LANG_POP(C++) fi -AM_CONDITIONAL([HAVE_DYNINST], [test "${have_dyninst}" = "yes"]) dnl Check for the libvirt and libxml2 devel packages diff --git a/doc/Makefile.in b/doc/Makefile.in index 24fa17d31..2247c7f27 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -183,6 +183,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -342,6 +343,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index d83130c54..ded109a57 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -191,6 +191,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -350,6 +351,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in index 708f89577..a63c09660 100644 --- a/doc/beginners/Makefile.in +++ b/doc/beginners/Makefile.in @@ -149,6 +149,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -308,6 +309,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ @@ -407,8 +409,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@INSTALL_PREBUILT_DOCS_FALSE@uninstall-local: @INSTALL_PREBUILT_DOCS_FALSE@clean-local: +@INSTALL_PREBUILT_DOCS_FALSE@uninstall-local: @INSTALL_PREBUILT_DOCS_FALSE@install-data-hook: clean: clean-am diff --git a/httpd/Makefile.in b/httpd/Makefile.in index 006dee2f5..545c68671 100644 --- a/httpd/Makefile.in +++ b/httpd/Makefile.in @@ -253,6 +253,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -412,6 +413,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/httpd/docker/Makefile.in b/httpd/docker/Makefile.in index cc1b15603..1011ab42d 100644 --- a/httpd/docker/Makefile.in +++ b/httpd/docker/Makefile.in @@ -195,6 +195,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -354,6 +355,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/java/Makefile.in b/java/Makefile.in index c2eb5e3df..2c2d16637 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -238,6 +238,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -397,6 +398,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ @@ -683,8 +685,8 @@ maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -@HAVE_JAVA_FALSE@install-data-local: @HAVE_JAVA_FALSE@install-exec-local: +@HAVE_JAVA_FALSE@install-data-local: @HAVE_JAVA_FALSE@uninstall-local: clean: clean-am diff --git a/man/Makefile.in b/man/Makefile.in index 83ac3a21d..7f24dd2ae 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -221,6 +221,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -380,6 +381,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/man/cs/Makefile.in b/man/cs/Makefile.in index ddaa81020..e50317092 100644 --- a/man/cs/Makefile.in +++ b/man/cs/Makefile.in @@ -185,6 +185,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -344,6 +345,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/python/Makefile.in b/python/Makefile.in index 7cdf86764..9d5d4e750 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -192,6 +192,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -351,6 +352,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ @@ -528,8 +530,8 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@HAVE_PYTHON_PROBES_FALSE@install-exec-local: @HAVE_PYTHON_PROBES_FALSE@clean-local: +@HAVE_PYTHON_PROBES_FALSE@install-exec-local: clean: clean-am clean-am: clean-generic clean-local mostlyclean-am diff --git a/stap-exporter/Makefile.in b/stap-exporter/Makefile.in index 90c85e2d4..370115a8e 100644 --- a/stap-exporter/Makefile.in +++ b/stap-exporter/Makefile.in @@ -182,6 +182,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -341,6 +342,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ @@ -521,9 +523,9 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." +@HAVE_PYTHON3_PROBES_FALSE@clean-local: @HAVE_PYTHON3_PROBES_FALSE@uninstall-local: @HAVE_PYTHON3_PROBES_FALSE@install-data-local: -@HAVE_PYTHON3_PROBES_FALSE@clean-local: clean: clean-am clean-am: clean-generic clean-local mostlyclean-am diff --git a/stapbpf/Makefile.in b/stapbpf/Makefile.in index 1f52a72a8..9c4ce4b41 100644 --- a/stapbpf/Makefile.in +++ b/stapbpf/Makefile.in @@ -250,6 +250,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -409,6 +410,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/stapdyn/Makefile.in b/stapdyn/Makefile.in index 460b2acfa..09621af3f 100644 --- a/stapdyn/Makefile.in +++ b/stapdyn/Makefile.in @@ -253,6 +253,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -412,6 +413,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@ diff --git a/staprun/Makefile.in b/staprun/Makefile.in index 60110e419..6741b5145 100644 --- a/staprun/Makefile.in +++ b/staprun/Makefile.in @@ -302,6 +302,7 @@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DYNINST_CXXFLAGS = @DYNINST_CXXFLAGS@ DYNINST_LDFLAGS = @DYNINST_LDFLAGS@ +DYNINST_LIBS = @DYNINST_LIBS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ @@ -461,6 +462,7 @@ py3execdir = @py3execdir@ pyexecdir = @pyexecdir@ python3dir = @python3dir@ pythondir = @pythondir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ selinux_CFLAGS = @selinux_CFLAGS@ selinux_LIBS = @selinux_LIBS@