From a63a95dc1994d08176b63f0a133749b531f22b80 Mon Sep 17 00:00:00 2001
From: dsmith <dsmith>
Date: Tue, 26 Sep 2006 21:41:37 +0000
Subject: 2006-09-26  David Smith  <dsmith@redhat.com>

	* .cvsignore: Changed 'stpd' reference to 'staprun'.
	* INTERNALS: Ditto.
	* buildrun.cxx (run_pass): Ditto.
	* lket.5.in: Ditto.
	* stap.1.in: Ditto.
	* stapruncs.5.in: Ditto.
	* examples/small_demos/demo_script.txt: Ditto.
	* examples/small_demos/sys.stp: Ditto.

	* systemtap.spec.in: Created a new subpackage,
	"systemtap-runtime", that contains staprun.

	* Makefile.am: Renamed 'stpd' to 'staprun' and moved it to
	$(bindir).
	* Makefile.in: Regenerated from Makefile.am.

	* configure.ac: Incremented version number.
	* configure: Regenerated from configure.ac.
---
 Makefile.am | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index a7e73b6e..6dd03d0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,14 @@ AUTOMAKE_OPTIONS = dist-bzip2
 
 pkglibexecdir = ${libexecdir}/${PACKAGE}
 
-AM_CPPFLAGS = -DPKGLIBDIR='"$(pkglibexecdir)"' -DPKGDATADIR='"${pkgdatadir}"'
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DPKGDATADIR='"${pkgdatadir}"'
 
 AM_CFLAGS = -std=gnu99 -D_GNU_SOURCE -fexceptions \
 	    -Wall -Werror -Wshadow -Wunused -Wformat=2 -W
 AM_CXXFLAGS = -Wall
 
 dist_man_MANS = stap.1 stapprobes.5 stapfuncs.5 stapex.5 lket.5
-bin_PROGRAMS = stap
+bin_PROGRAMS = stap staprun
 stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx loc2c.c
@@ -47,11 +47,8 @@ install-elfutils:
 install-exec-local: install-elfutils
 endif
 
-# stpd goes into $libexec/$package, so libexec_PROGRAMS would
-# put it into the wrong location
-pkglibexec_PROGRAMS = stpd
-stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
-stpd_LDADD = -lpthread
+staprun_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
+staprun_LDADD = -lpthread
 
 pkglibexec_SCRIPTS = stp_check
 CLEANFILES += $(pkglibexec_SCRIPTS)
-- 
cgit