diff options
| author | James Henstridge <james@jamesh.id.au> | 2005-12-12 09:38:15 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2005-12-12 09:38:15 +0000 |
| commit | aa5ac8fc10d5c04fbdf78145aa5d933685ec796d (patch) | |
| tree | e05a16735aaa79cad15fb143b6ee0aded6bcb99b /doc | |
| parent | a7db1f4dfd236013291bbfd62deda29c3aa2070c (diff) | |
| download | libgtop-aa5ac8fc10d5c04fbdf78145aa5d933685ec796d.tar.gz | |
remove unused file.
2005-12-12 James Henstridge <james@jamesh.id.au>
* doc/auto-macros.texi.in: remove unused file.
* doc/libgtop2.texi: don't include auto-macros.texi.
* doc/Makefile.am: don't build auto-macros.texi, since none of its
macros are used in the documentation any more.
* include/glibtop/global.h: don't include <config.h> from headers.
* .../*.c: make sure <config.h> is the first thing included.
* acinclude.m4: m4_include() libgtop-sysdeps.m4 rather than
inlining it.
* acinclude.m4, libgtop-sysdeps.m4: use third argument to
AC_DEFINE() to set the comment.
* configure.in: modernise a bit.
* acconfig.h: remove file, since it is deprecated
* autogen.sh: require automake 1.9 instead of 1.4.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.am | 36 | ||||
| -rw-r--r-- | doc/auto-macros.texi.in | 12 | ||||
| -rw-r--r-- | doc/libgtop2.texi | 1 |
3 files changed, 2 insertions, 47 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 93ff815c..23f26b7d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,38 +1,6 @@ info_TEXINFOS = libgtop2.texi libgtop2_TEXINFOS = libgtop2.texi about.texi reference.texi \ - auto-macros.texi version.texi main.texi \ - white-paper.texi + version.texi main.texi white-paper.texi -MAKEINFO = @MAKEINFO@ -I @libgtop_top_builddir@/doc - -EXTRA_DIST = auto-macros.texi.in - -auto-macros.texi: auto-macros.texi.in Makefile -## Use sed and then mv to avoid problems if the user interrupts. - sed -e 's#\%LIBGTOP_LIBDIR\%#$(libdir)#g' \ - -e 's#\%LIBGTOP_INCLUDEDIR\%#$(includedir)/libgtop-2.0#g' \ - -e 's#\%LIBGTOP_DATADIR\%#$(datadir)#g' \ - -e 's#\%LIBGTOP_EXTRA_LIBS\%#$(LIBGTOP_EXTRA_LIBS)#g' \ - -e 's#\%LIBGTOP_LIBS\%#$(LIBGTOP_LIBS)#g' \ - -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \ - -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \ - -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \ - -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \ - -e 's#\%LIBGTOP_MINOR_VERSION\%#$(LIBGTOP_MINOR_VERSION)#g' \ - -e 's#\%LIBGTOP_MICRO_VERSION\%#$(LIBGTOP_MICRO_VERSION)#g' \ - -e 's#\%LIBGTOP_VERSION\%#$(LIBGTOP_VERSION)#g' \ - -e 's#\%LIBGTOP_VERSION_CODE\%#$(LIBGTOP_VERSION_CODE)#g' \ - -e 's#\%LIBGTOP_SERVER_VERSION\%#$(LIBGTOP_SERVER_VERSION)#g' \ - -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \ - -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \ - -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \ - -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \ - < $(srcdir)/auto-macros.texi.in > auto-macros.tmp - echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp - if [ $(LIBGTOP_VERSION_CODE) -ge 1001000 ] ; then \ - echo '@set LIBGTOP-1-1' >> auto-macros.tmp ; \ - else \ - echo '@clear LIBGTOP-1-1' >> auto-macros.tmp ; \ - fi - mv auto-macros.tmp auto-macros.texi +AM_MAKEINFOFLAGS = -I $(libgtop_top_builddir)/doc diff --git a/doc/auto-macros.texi.in b/doc/auto-macros.texi.in deleted file mode 100644 index eab55b77..00000000 --- a/doc/auto-macros.texi.in +++ /dev/null @@ -1,12 +0,0 @@ -@c LibGTop major, minor and micro version. -@set LIBGTOP_MAJOR_VERSION %LIBGTOP_MAJOR_VERSION% -@set LIBGTOP_MINOR_VERSION %LIBGTOP_MINOR_VERSION% -@set LIBGTOP_MICRO_VERSION %LIBGTOP_MICRO_VERSION% - -@c LibGTop version and numerical version code ("1.234.567" -> 1234567). -@set LIBGTOP_VERSION "%LIBGTOP_VERSION%" -@set LIBGTOP_VERSION_CODE %LIBGTOP_VERSION_CODE% - -@c LibGTop server version, increased each time the protocol changes. -@set LIBGTOP_SERVER_VERSION %LIBGTOP_SERVER_VERSION% - diff --git a/doc/libgtop2.texi b/doc/libgtop2.texi index 2dc8b31a..8ca66851 100644 --- a/doc/libgtop2.texi +++ b/doc/libgtop2.texi @@ -5,7 +5,6 @@ @setchapternewpage odd @c %**end of header -@include auto-macros.texi @include version.texi @ifinfo |