update .gitignore

.gitignore

@@ -3,3 +3,29 @@
 *.d
 sammler
 sammler.log
+
+Makefile.in
+aclocal.m4
+autoconfig.h.in
+autom4te.cache
+config.guess
+config.sub
+configure
+install-sh
+ltmain.sh
+missing
+
+Makefile
+autoconfig.h
+config.log
+config.status
+libtool
+stamp-h1
+
+.libs
+autoconfig.h.in~
+*.la
+*.lo
+
+sammler-*.tar.bz2
+sammler-*.tar.gz

INSTALL

@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+

Makefile

@@ -1,30 +0,0 @@
-# Toplevel Makefile
-
-SAMMLER_SRC := sammler.c config.c logging.c rrdtool.c plugins.c
-PLUGIN_SRC := $(wildcard p_*.c)
-CFLAGS := -O2 -Wall 
-LDFLAGS := -ldl -lrrd -rdynamic
-
-# ############################
-
-all: sammler $(PLUGIN_SRC:%.c=%.so)
-
-sammler: $(SAMMLER_SRC:%.c=%.o)
-	$(CC) $(LDFLAGS) $^ -o $@
-
-%.d: %.c
-	$(CC) $(CFLAGS) -MM -c $< -o $@
-
-%.o: %.c
-	$(CC) $(CFLAGS) -o $@ -c $<
-
-%_sh.o: %.c
-	$(CC) $(CFLAGS) -fPIC -o $@ -c $<
-
-%.so: %_sh.o
-	$(LD) -shared -o $@ $<
-
-clean:
-	rm -rf *.d *.o *.so sammler
-
-#-include $(SAMMLER_SRC:.c=.d) $(PLUGIN_SRC:.c=.d)

Makefile.am

@@ -0,0 +1,59 @@
+AUTOMAKE_OPTIONS = foreign no-dependencies
+
+EXTRA_DIST = sammler.conf
+
+AM_CFLAGS = -Wall -Werror
+
+bin_PROGRAMS = sammler
+
+sammler_SOURCES = config.c config.h \
+    list.h \
+    logging.c logging.h \
+    plugins.c plugins.h \
+    rrdtool.c rrdtool.h \
+    sammler.c
+
+sammler_LDADD = -ldl -lrrd 
+sammler_LDFLAGS = -rdynamic
+
+pkglib_LTLIBRARIES =
+
+pkglib_LTLIBRARIES += p_ctstat.la
+p_ctstat_la_SOURCES = p_ctstat.c
+p_ctstat_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_load.la
+p_load_la_SOURCES = p_load.c
+p_load_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_memory.la
+p_memory_la_SOURCES = p_memory.c
+p_memory_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_mount.la
+p_mount_la_SOURCES = p_mount.c
+p_mount_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_netdev.la
+p_netdev_la_SOURCES = p_netdev.c
+p_netdev_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_random.la
+p_random_la_SOURCES = p_random.c
+p_random_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_rtstat.la
+p_rtstat_la_SOURCES = p_rtstat.c
+p_rtstat_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_stat.la
+p_stat_la_SOURCES = p_stat.c
+p_stat_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_uptime.la
+p_uptime_la_SOURCES = p_uptime.c
+p_uptime_la_LDFLAGS = -module -avoid-version
+
+pkglib_LTLIBRARIES += p_vmstat.la
+p_vmstat_la_SOURCES = p_vmstat.c
+p_vmstat_la_LDFLAGS = -module -avoid-version

autobuild.sh

@@ -0,0 +1,7 @@
+#! /bin/sh
+
+autoheader \
+&& aclocal \
+&& libtoolize --copy --force \
+&& automake --add-missing --copy \
+&& autoconf

configure.in

@@ -0,0 +1,21 @@
+dnl Process this file with autoconf to produce a configure script.
+AC_INIT(sammler, 0.00)
+AC_CONFIG_SRCDIR(sammler.c)
+AC_CONFIG_HEADER(autoconfig.h)
+AM_INIT_AUTOMAKE(dist-bzip2)
+AC_LANG(C)
+
+AC_PREFIX_DEFAULT("/usr/local")
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AM_CONDITIONAL(COMPILER_IS_GCC, test "x$GCC" = "xyes")
+
+dnl configure libtool
+AC_DISABLE_STATIC
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
+
+AC_OUTPUT(Makefile)