2005-07-21 Martin Hunt <hunt@redhat.com>

        * Makefile.am (EXTRA_DIST): Add systemtap.spec.
        (install-data-local): Install docs and probes.
        (docs): New target.
        (rpm): New target.

        * configure.ac: Set initial version to 0.1.1.
        (pkglibdir): Set to libexec.

        * Makefile.in: Regenerated.

5 files changed, 95 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index 948df49d..02e030a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-21  Martin Hunt  <hunt@redhat.com>
+
+	* Makefile.am (EXTRA_DIST): Add systemtap.spec.
+	(install-data-local): Install docs and probes.
+	(docs): New target.
+	(rpm): New target.
+	
+	* configure.ac: Set initial version to 0.1.1.
+	(pkglibdir): Set to libexec.
+
+	* Makefile.in: Regenerated.
+	
 2005-07-20  Graydon Hoare  <graydon@redhat.com>
 
 	* elaborate.{cxx,h} (find_array): Remove.
diff --git a/Makefile.am b/Makefile.am
index 2db6d044..64679647 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ stap_SOURCES = main.cxx \
 	parse.cxx staptree.cxx elaborate.cxx translate.cxx \
 	tapsets.cxx buildrun.cxx
 
-pkglib_PROGRAMS = stpd
+libexec_PROGRAMS = stpd
 stpd_SOURCES = runtime/stpd/stpd.c runtime/stpd/librelay.c
 stpd_LDADD = -lpthread
 
@@ -17,15 +17,21 @@ AM_CXXFLAGS = -Wall
 # Get extra libs as needed
 LDADD =
 
-EXTRA_DIST=testsuite runtime $(wildcard $(srcdir)/*.h)
+EXTRA_DIST=testsuite runtime $(wildcard $(srcdir)/*.h) systemtap.spec
 dist-hook:
-	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' -o name ChangeLog | xargs rm -rf
 	find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
+pkgdocdir = ${prefix}/share/doc/systemtap
+
 install-data-local:
-	mkdir -p $(DESTDIR)$(pkgdatadir)
-	cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir)
+	mkdir -p $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgdocdir) $(DESTDIR)$(pkgdocdir)/runtime
+	mkdir -p $(DESTDIR)$(pkgdocdir)/runtime/docs $(DESTDIR)$(pkgdatadir)/runtime/docs
+	cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile $(DESTDIR)$(pkgdatadir)
+	cp -rp $(srcdir)/runtime/probes $(DESTDIR)$(pkgdatadir)/probes
+	cp -rp $(srcdir)/runtime/docs/html/* $(DESTDIR)$(pkgdocdir)/runtime
 	find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+	find $(DESTDIR)$(pkgdocdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 
 p=$(srcdir)/testsuite/parse
 s=$(srcdir)/testsuite/sem
@@ -46,6 +52,12 @@ gcov:
 	@rm -f `ls -1 *.gcov | fgrep -v .cxx.gcov`
 	ls -l *.cxx.gcov
 
-clean-local:
-	rm -f *.gcov *.gcno *.gcda
+docs:	runtime/Doxyfile
+	cd runtime && doxygen Doxyfile
 
+rpm:	dist docs
+	rpmbuild -ta @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.gz
+
+clean-local:
+	rm -f *.gcov *.gcno *.gcda @PACKAGE_TARNAME@-*.tar.gz
+	rm -rf @PACKAGE_TARNAME@-@PACKAGE_VERSION@
diff --git a/Makefile.in b/Makefile.in
index 2e4b0aeb..07fc3716 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -39,12 +39,12 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = stap$(EXEEXT)
-pkglib_PROGRAMS = stpd$(EXEEXT)
+libexec_PROGRAMS = stpd$(EXEEXT)
 subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.in \
-	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-	TODO depcomp install-sh missing
+	$(srcdir)/systemtap.spec.in $(top_srcdir)/configure AUTHORS \
+	COPYING ChangeLog INSTALL NEWS TODO depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -53,11 +53,11 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"
+CONFIG_CLEAN_FILES = systemtap.spec
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
-PROGRAMS = $(bin_PROGRAMS) $(pkglib_PROGRAMS)
+libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)
 am_stap_OBJECTS = main.$(OBJEXT) parse.$(OBJEXT) staptree.$(OBJEXT) \
 	elaborate.$(OBJEXT) translate.$(OBJEXT) tapsets.$(OBJEXT) \
 	buildrun.$(OBJEXT)
@@ -193,7 +193,8 @@ AM_CXXFLAGS = -Wall
 
 # Get extra libs as needed
 LDADD = 
-EXTRA_DIST = testsuite runtime $(wildcard $(srcdir)/*.h)
+EXTRA_DIST = testsuite runtime $(wildcard $(srcdir)/*.h) systemtap.spec
+pkgdocdir = ${prefix}/share/doc/systemtap
 p = $(srcdir)/testsuite/parse
 s = $(srcdir)/testsuite/sem
 t = $(srcdir)/testsuite/trans
@@ -261,6 +262,8 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
 	-rm -f config.h stamp-h1
+systemtap.spec: $(top_builddir)/config.status $(srcdir)/systemtap.spec.in
+	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
@@ -284,29 +287,29 @@ uninstall-binPROGRAMS:
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
+install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
-	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
+	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
+	   $(INSTALL_PROGRAM_ENV) $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
 	  else :; fi; \
 	done
 
-uninstall-pkglibPROGRAMS:
+uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
+	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
 	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
 	done
 
-clean-pkglibPROGRAMS:
-	-test -z "$(pkglib_PROGRAMS)" || rm -f $(pkglib_PROGRAMS)
+clean-libexecPROGRAMS:
+	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
 stap$(EXEEXT): $(stap_OBJECTS) $(stap_DEPENDENCIES) 
 	@rm -f stap$(EXEEXT)
 	$(CXXLINK) $(stap_LDFLAGS) $(stap_OBJECTS) $(stap_LDADD) $(LIBS)
@@ -511,7 +514,7 @@ check-TESTS: $(TESTS)
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/$(srcdir)
+	$(mkdir_p) $(distdir)/$(srcdir) $(distdir)/.
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -643,7 +646,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -672,8 +675,8 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-local \
-	clean-pkglibPROGRAMS mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-local mostlyclean-am
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
@@ -694,7 +697,7 @@ info-am:
 
 install-data-am: install-data-local
 
-install-exec-am: install-binPROGRAMS install-pkglibPROGRAMS
+install-exec-am: install-binPROGRAMS install-libexecPROGRAMS
 
 install-info: install-info-am
 
@@ -722,32 +725,36 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am \
-	uninstall-pkglibPROGRAMS
+	uninstall-libexecPROGRAMS
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
-	clean clean-binPROGRAMS clean-generic clean-local \
-	clean-pkglibPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
-	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+	clean clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
+	clean-local ctags dist dist-all dist-bzip2 dist-gzip dist-hook \
+	dist-shar dist-tarZ dist-zip distcheck distclean \
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-binPROGRAMS install-data install-data-am \
 	install-data-local install-exec install-exec-am install-info \
-	install-info-am install-man install-pkglibPROGRAMS \
+	install-info-am install-libexecPROGRAMS install-man \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-info-am uninstall-pkglibPROGRAMS
+	uninstall-info-am uninstall-libexecPROGRAMS
 
 dist-hook:
-	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+	find $(distdir) -name CVS -o -name '*~' -o -name '.#*' -o name ChangeLog | xargs rm -rf
 	find $(distdir) -name '*.o' -o -name '*.ko' -o -name '*.cmd' -o -name '*.mod.c' -o -name '.??*' | xargs rm -rf
 
 install-data-local:
-	mkdir -p $(DESTDIR)$(pkgdatadir)
-	cp -rp $(srcdir)/runtime $(DESTDIR)$(pkgdatadir)
+	mkdir -p $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(pkgdocdir) $(DESTDIR)$(pkgdocdir)/runtime
+	mkdir -p $(DESTDIR)$(pkgdocdir)/runtime/docs $(DESTDIR)$(pkgdatadir)/runtime/docs
+	cp -rp $(srcdir)/runtime/*.[ch] $(srcdir)/runtime/Doxyfile $(DESTDIR)$(pkgdatadir)
+	cp -rp $(srcdir)/runtime/probes $(DESTDIR)$(pkgdatadir)/probes
+	cp -rp $(srcdir)/runtime/docs/html/* $(DESTDIR)$(pkgdocdir)/runtime
 	find $(DESTDIR)$(pkgdatadir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
+	find $(DESTDIR)$(pkgdocdir) -name CVS -o -name '*~' -o -name '.#*' | xargs rm -rf
 
 gcov:
 	@$(MAKE) clean CXXFLAGS="-g -fprofile-arcs -ftest-coverage" all check
@@ -756,8 +763,15 @@ gcov:
 	@rm -f `ls -1 *.gcov | fgrep -v .cxx.gcov`
 	ls -l *.cxx.gcov
 
+docs:	runtime/Doxyfile
+	cd runtime && doxygen Doxyfile
+
+rpm:	dist docs
+	rpmbuild -ta @PACKAGE_TARNAME@-@PACKAGE_VERSION@.tar.gz
+
 clean-local:
-	rm -f *.gcov *.gcno *.gcda
+	rm -f *.gcov *.gcno *.gcda @PACKAGE_TARNAME@-*.tar.gz
+	rm -rf @PACKAGE_TARNAME@-@PACKAGE_VERSION@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/configure b/configure
index 37e9bbcb..cdf2ac9e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for systemtap 1.0.
+# Generated by GNU Autoconf 2.59 for systemtap 0.1.1.
 #
 # Report bugs to <systemtap@sources.redhat.com>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='systemtap'
 PACKAGE_TARNAME='systemtap'
-PACKAGE_VERSION='1.0'
-PACKAGE_STRING='systemtap 1.0'
+PACKAGE_VERSION='0.1.1'
+PACKAGE_STRING='systemtap 0.1.1'
 PACKAGE_BUGREPORT='systemtap@sources.redhat.com'
 
 # Factoring default headers for most tests.
@@ -791,7 +791,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures systemtap 1.0 to adapt to many kinds of systems.
+\`configure' configures systemtap 0.1.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -853,7 +853,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of systemtap 1.0:";;
+     short | recursive ) echo "Configuration of systemtap 0.1.1:";;
    esac
   cat <<\_ACEOF
 
@@ -976,7 +976,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-systemtap configure 1.0
+systemtap configure 0.1.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -990,7 +990,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by systemtap $as_me 1.0, which was
+It was created by systemtap $as_me 0.1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1635,7 +1635,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='systemtap'
- VERSION='1.0'
+ VERSION='0.1.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5697,7 +5697,7 @@ _ACEOF
 # my_libexecdir=`eval echo $libexecdir`
 # my_libexecdir="$libexecdir"
 
-my_pkglibdir=${prefix}/lib/systemtap
+my_pkglibdir=${prefix}/libexec/systemtap
 
 cat >>confdefs.h <<_ACEOF
 #define PKGLIBDIR "$my_pkglibdir"
@@ -5715,7 +5715,7 @@ _ACEOF
 
           ac_config_headers="$ac_config_headers config.h:config.in"
 
-          ac_config_files="$ac_config_files Makefile"
+                    ac_config_files="$ac_config_files Makefile systemtap.spec"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -6114,7 +6114,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by systemtap $as_me 1.0, which was
+This file was extended by systemtap $as_me 0.1.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6177,7 +6177,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-systemtap config.status 1.0
+systemtap config.status 0.1.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -6288,6 +6288,7 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+  "systemtap.spec" ) CONFIG_FILES="$CONFIG_FILES systemtap.spec" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/configure.ac b/configure.ac
index 29f80630..3ff4b1b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl configure.ac --- autoconf input file for systemtap
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([systemtap], 1.0, systemtap@sources.redhat.com, systemtap)
+AC_INIT([systemtap], 0.1.1, systemtap@sources.redhat.com, systemtap)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE
@@ -38,7 +38,7 @@ AC_SUBST(DATE)
 # my_libexecdir=`eval echo $libexecdir`
 # my_libexecdir="$libexecdir"
 
-my_pkglibdir=${prefix}/lib/systemtap
+my_pkglibdir=${prefix}/libexec/systemtap
 AC_DEFINE_UNQUOTED(PKGLIBDIR, "$my_pkglibdir", [pkglibdir])
 AC_SUBST(PKGLIBDIR)
 
@@ -47,5 +47,5 @@ AC_DEFINE_UNQUOTED(PKGDATADIR, "$my_pkgdatadir", [datadir])
 AC_SUBST(PKGDATADIR)
 
 AC_CONFIG_HEADERS([config.h:config.in])
-AC_CONFIG_FILES(Makefile)
+AC_CONFIG_FILES(Makefile systemtap.spec)
 AC_OUTPUT