From e9d58a72a2bb86b59593dc700f07f6e411305fb7 Mon Sep 17 00:00:00 2001
From: roland <roland>
Date: Fri, 29 Jul 2005 08:37:06 +0000
Subject: 2005-07-29  Roland McGrath  <roland@redhat.com>

	* systemtap.spec.in: Include %{_datadir}/systemtap/tapset directory.
	(%check): Add section, run make check.
	* Makefile.am (EXTRA_DIST): Add runtest.sh.
	* Makefile.in: Regenerated.
	* systemtap.spec.in: Include man pages.
	* Makefile.am (man_MANS): Renamed to dist_man_MANS.
	* configure.ac: Add AM_CONDITIONAL definition of HAVE_LIBDW.
	* Makefile.am [HAVE_LIBDW] (stap_SOURCES_libdw): New variable.
	(stap_SOURCES): Use it, moving loc2c.c there.
	* configure, config.in: Regenerated.
	* configure.ac: Don't check for libelf.h, not actually #include'd.
	Update -ldw check for merged libdwfl+libdw.
	(stap_LIBS): New substituted variable.  Set only this, not LIBS,
	with -ldw check.
	* Makefile.am (stap_LDADD): New variable, use @stap_LIBS@.
	* Makefile.am (AM_CPPFLAGS): Use ${pkgdatadir}.
	(AM_CFLAGS): Use -W instead of -Wextra, for gcc 3 compatibility.
	(stpd_LDFLAGS): Variable removed.
	(AM_MAKEFLAGS): Variable removed.
---
 Makefile.am | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index b09cc3a8..43ac30df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,32 +1,34 @@
 # Makefile.am --- automake input file for systemtap
 ## process this file with automake to produce Makefile.in
 
-AM_MAKEFLAGS = 'CXXFLAGS=$(CXXFLAGS)' 'LDFLAGS=$(LDFLAGS)'
-
 AM_CPPFLAGS = -DPKGLIBDIR='"${libexecdir}/${PACKAGE}"' \
-	      -DPKGDATADIR='"${datadir}/${PACKAGE}"'
+	      -DPKGDATADIR='"${pkgdatadir}"'
 
-AM_CFLAGS = -D_GNU_SOURCE -Wall -Werror -Wshadow -Wunused -Wformat=2 -Wextra -std=gnu99
+AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE \
+	    -Wall -Werror -Wshadow -Wunused -Wformat=2 -W
+AM_CXXFLAGS = -Wall
 
-man_MANS = stap.1
+dist_man_MANS = stap.1
 bin_PROGRAMS = stap
 stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
-	tapsets.cxx buildrun.cxx loc2c.c
+	tapsets.cxx buildrun.cxx $(stap_SOURCES_libdw)
+if HAVE_LIBDW
+stap_SOURCES_libdw = loc2c.c
+endif
+stap_LDADD = @stap_LIBS@
+
 stap_CXXFLAGS = -Werror $(AM_CXXFLAGS)
 
 libexec_PROGRAMS = stpd
 stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
 stpd_LDADD = -lpthread
-# automake doesn't get rpath right unless we do this
-# stpd_LDFLAGS = -Wl,-rpath '$(libdir)/systemtap'
-
-AM_CXXFLAGS = -Wall
 
 # Get extra libs as needed
 LDADD =
 
-EXTRA_DIST=testsuite runtime tapset $(wildcard $(srcdir)/*.h) systemtap.spec
+EXTRA_DIST = testsuite runtest.sh $(wildcard $(srcdir)/*.h) systemtap.spec \
+	     runtime tapset
 dist-hook:
 	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 	find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
-- 
cgit