diff --git a/ChangeLog b/ChangeLog index 047b3381..95f24cf1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1998-08-29 Martin Baulig + + * LIBGTOP-VERSION (LIBGTOP_INTERFACE_AGE, LIBGTOP_BINARY_AGE): Added. + * configure.in (LIBGTOP_INTERFACE_AGE, LIBGTOP_BINARY_AGE): AC_SUBST. + (LT_RELEASE, LT_CURRENT, LT_REVISION, LT_AGE): AC_SUBST. + (LT_VERSION_INFO): Sets `-version-info' for libtool. + + * */Makefile.am: We now use the correct `-version-info' parameter + for libtool. + 1998-08-25 Martin Baulig * include/glibtop/command.h (glibtop_call): Third argument is @@ -6,6 +16,8 @@ * include/glibtop/xmalloc.h (glibtop_free): Now taking a `const void *'. +1998-08-25 Martin Baulig + * src/daemon/ChangeLog: New file. * sysdeps/sun4/ChangeLog: New file. diff --git a/LIBGTOP-VERSION b/LIBGTOP-VERSION index e749678e..6f51aeed 100644 --- a/LIBGTOP-VERSION +++ b/LIBGTOP-VERSION @@ -1,6 +1,18 @@ +# Making releases: +# LIBGTOP_MICRO_VERSION += 1; +# LIBGTOP_INTERFACE_AGE += 1; +# LIBGTOP_BINARY_AGE += 1; +# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0. +# if backwards compatibility has been broken, +# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0. +# LIBGTOP_MAJOR_VERSION=0 LIBGTOP_MINOR_VERSION=25 LIBGTOP_MICRO_VERSION=0 + +LIBGTOP_INTERFACE_AGE=0 +LIBGTOP_BINARY_AGE=0 + LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION # Increase each time you change the client/server protocol. diff --git a/configure.in b/configure.in index 81307555..ea240eb7 100644 --- a/configure.in +++ b/configure.in @@ -12,9 +12,23 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION) AC_SUBST(LIBGTOP_MAJOR_VERSION) AC_SUBST(LIBGTOP_MINOR_VERSION) AC_SUBST(LIBGTOP_MICRO_VERSION) +AC_SUBST(LIBGTOP_INTERFACE_AGE) +AC_SUBST(LIBGTOP_BINARY_AGE) AC_SUBST(LIBGTOP_SERVER_VERSION) AC_SUBST(LIBGTOP_VERSION) +# libtool versioning +LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION +LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE` +LT_REVISION=$LIBGTOP_INTERFACE_AGE +LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE` +LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' +AC_SUBST(LT_VERSION_INFO) +AC_SUBST(LT_RELEASE) +AC_SUBST(LT_CURRENT) +AC_SUBST(LT_REVISION) +AC_SUBST(LT_AGE) + AM_ACLOCAL_INCLUDE(macros) AC_ISC_POSIX diff --git a/lib/Makefile.am b/lib/Makefile.am index f5434ec2..f6eef6cc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -8,6 +8,8 @@ libgtop_la_SOURCES = init.c open.c close.c command.c read.c \ read_data.c write.c lib.c parameter.c \ sysdeps.c +libgtop_la_LDFLAGS = $(LT_VERSION_INFO) + BUILT_SOURCES = lib.c lib.c: lib.awk $(top_builddir)/config.h $(top_srcdir)/features.def diff --git a/sysdeps/common/Makefile.am b/sysdeps/common/Makefile.am index fcf635f2..20553511 100644 --- a/sysdeps/common/Makefile.am +++ b/sysdeps/common/Makefile.am @@ -16,6 +16,10 @@ libgtop_common_la_SOURCES = xmalloc.c error.c gnuslib.c \ fsusage.c fsusage.h mountlist.c mountlist.h \ $(inodedb_SRCLIST) +libgtop_common_la_LDFLAGS = $(LT_VERSION_INFO) + libgtop_suid_common_la_SOURCES = xmalloc.c error.c sysdeps_suid.c +libgtop_suid_common_la_LDFLAGS = $(LT_VERSION_INFO) + EXTRA_DIST = inodedb.c diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am index becf8b3c..09cfc3b4 100644 --- a/sysdeps/freebsd/Makefile.am +++ b/sysdeps/freebsd/Makefile.am @@ -8,12 +8,16 @@ lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) + libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procmap.c +libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) + include_HEADERS = glibtop_server.h glibtop_machine.h \ glibtop_suid.h diff --git a/sysdeps/guile/Makefile.am b/sysdeps/guile/Makefile.am index c9f49f48..decb52c0 100644 --- a/sysdeps/guile/Makefile.am +++ b/sysdeps/guile/Makefile.am @@ -8,6 +8,8 @@ lib_LTLIBRARIES = libgtop_guile.la libgtop_guile_la_SOURCES = guile.c +libgtop_guile_la_LDFLAGS = $(LT_VERSION_INFO) + BUILT_SOURCES = guile.c guile.c: guile.awk $(top_builddir)/config.h $(top_srcdir)/features.def diff --git a/sysdeps/guile/names/Makefile.am b/sysdeps/guile/names/Makefile.am index 9ca53ee0..725ddb7a 100644 --- a/sysdeps/guile/names/Makefile.am +++ b/sysdeps/guile/names/Makefile.am @@ -6,6 +6,8 @@ lib_LTLIBRARIES = libgtop_guile_names.la libgtop_guile_names_la_SOURCES = guile-names.c +libgtop_guile_names_la_LDFLAGS = $(LT_VERSION_INFO) + BUILT_SOURCES = guile-names.c guile-names.c: guile-names.awk $(top_builddir)/config.h $(top_srcdir)/features.def diff --git a/sysdeps/kernel/Makefile.am b/sysdeps/kernel/Makefile.am index fcc2f1cf..9515f644 100644 --- a/sysdeps/kernel/Makefile.am +++ b/sysdeps/kernel/Makefile.am @@ -10,6 +10,8 @@ libgtop_sysdeps_la_SOURCES = open.c close.c kernel.s cpu.c mem.c swap.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c siglist.c procmap.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) + include_HEADERS = glibtop_server.h kernel.o kernel.lo: $(srcdir)/kernel.s diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am index a54e53cf..b4e2c7e1 100644 --- a/sysdeps/linux/Makefile.am +++ b/sysdeps/linux/Makefile.am @@ -10,4 +10,6 @@ libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procmap.c siglist.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) + include_HEADERS = glibtop_server.h glibtop_machine.h diff --git a/sysdeps/names/Makefile.am b/sysdeps/names/Makefile.am index 65ebcf06..d282c559 100644 --- a/sysdeps/names/Makefile.am +++ b/sysdeps/names/Makefile.am @@ -10,3 +10,6 @@ libgtop_names_la_SOURCES = cpu.c mem.c swap.c uptime.c loadavg.c \ proctime.c procmem.c procsignal.c \ prockernel.c procsegment.c fsusage.c \ mountlist.c procmap.c + +libgtop_names_la_LDFLAGS = $(LT_VERSION_INFO) + diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am index de9c1366..e981e468 100644 --- a/sysdeps/osf1/Makefile.am +++ b/sysdeps/osf1/Makefile.am @@ -7,11 +7,13 @@ lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_la_LIBADD = -lmach libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c proclist.c \ procstate.c procuid.c proctime.c procmem.c \ procsignal.c prockernel.c procsegment.c +libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_la_LIBADD = -lmach include_HEADERS = glibtop_server.h glibtop_machine.h diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am index 0b729f62..8145ca10 100644 --- a/sysdeps/stub/Makefile.am +++ b/sysdeps/stub/Makefile.am @@ -10,3 +10,5 @@ libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procmap.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) + diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am index 046ec1bd..1d0962dc 100644 --- a/sysdeps/stub_suid/Makefile.am +++ b/sysdeps/stub_suid/Makefile.am @@ -6,10 +6,14 @@ lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) + libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ uptime.c loadavg.c shm_limits.c msg_limits.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c +libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) + include_HEADERS = glibtop_server.h glibtop_machine.h diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am index 26785311..7135bde7 100644 --- a/sysdeps/sun4/Makefile.am +++ b/sysdeps/sun4/Makefile.am @@ -5,6 +5,7 @@ CFLAGS = -Wall -W @CFLAGS@ lib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la libgtop_sysdeps_la_SOURCES = nosuid.c siglist.c +libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_la_LIBADD = -lkvm libgtop_sysdeps_suid_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ @@ -12,6 +13,7 @@ libgtop_sysdeps_suid_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ sem_limits.c proclist.c procstate.c procuid.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c +libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_la_LIBADD = -lkvm include_HEADERS = glibtop_server.h glibtop_machine.h