From 5f0246b07d97aad992cdae24c74d58031decd954 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Tue, 22 Feb 2000 21:01:14 +0000 Subject: [PATCH] Only install the libs in $(LIBGTOP_BACKEND_DIR) when we 2000-02-22 Martin Baulig * Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR) when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise. --- backends/common/ChangeLog | 5 +++++ backends/common/Makefile.am | 8 +++++++- backends/server/ChangeLog | 5 +++++ backends/server/Makefile.am | 8 +++++++- backends/sysdeps/ChangeLog | 5 +++++ backends/sysdeps/Makefile.am | 8 +++++++- sysdeps/solaris/ChangeLog | 5 +++++ sysdeps/solaris/Makefile.am | 8 +++++++- 8 files changed, 48 insertions(+), 4 deletions(-) diff --git a/backends/common/ChangeLog b/backends/common/ChangeLog index c88e7e3c..abb70b1a 100644 --- a/backends/common/ChangeLog +++ b/backends/common/ChangeLog @@ -1,3 +1,8 @@ +2000-02-22 Martin Baulig + + * Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR) + when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise. + 2000-01-12 Martin Baulig * Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR). diff --git a/backends/common/Makefile.am b/backends/common/Makefile.am index b320b959..fb8a75a7 100644 --- a/backends/common/Makefile.am +++ b/backends/common/Makefile.am @@ -4,6 +4,12 @@ INCLUDES = @INCLUDES@ backenddir = @LIBGTOP_BACKEND_DIR@ +if LIBGTOP_USE_GMODULE +backendlibdir = $(backenddir) +else +backendlibdir = $(libdir) +endif + dynamic_ldflags = @libgtop_dynamic_ldflags@ backend_DATA = \ @@ -12,7 +18,7 @@ backend_DATA = \ noinst_HEADERS = \ glibtop-backend-private.h -backend_LTLIBRARIES = \ +backendlib_LTLIBRARIES = \ libgtop_backend_common.la libgtop_backend_common_la_SOURCES = \ diff --git a/backends/server/ChangeLog b/backends/server/ChangeLog index 20b8117f..1bb2b2cf 100644 --- a/backends/server/ChangeLog +++ b/backends/server/ChangeLog @@ -1,3 +1,8 @@ +2000-02-22 Martin Baulig + + * Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR) + when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise. + 2000-01-18 Martin Baulig * demarshal.pl: Only emit code for functions which are diff --git a/backends/server/Makefile.am b/backends/server/Makefile.am index d65ae001..6d70bad1 100644 --- a/backends/server/Makefile.am +++ b/backends/server/Makefile.am @@ -7,6 +7,12 @@ INCLUDES = @INCLUDES@ -D_BSD \ backenddir = @LIBGTOP_BACKEND_DIR@ +if LIBGTOP_USE_GMODULE +backendlibdir = $(backenddir) +else +backendlibdir = $(libdir) +endif + dynamic_ldflags = @libgtop_dynamic_ldflags@ backend_DATA = \ @@ -15,7 +21,7 @@ backend_DATA = \ noinst_HEADERS = \ glibtop-backend-private.h -backend_LTLIBRARIES = \ +backendlib_LTLIBRARIES = \ libgtop_backend_server.la bin_PROGRAMS = \ diff --git a/backends/sysdeps/ChangeLog b/backends/sysdeps/ChangeLog index a2783e0e..947e2bbb 100644 --- a/backends/sysdeps/ChangeLog +++ b/backends/sysdeps/ChangeLog @@ -1,3 +1,8 @@ +2000-02-22 Martin Baulig + + * Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR) + when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise. + 2000-01-22 Martin Baulig * libgtop-sysdeps.backend: Added "ExtraLibs" section to diff --git a/backends/sysdeps/Makefile.am b/backends/sysdeps/Makefile.am index 6051ebe6..c39602cc 100644 --- a/backends/sysdeps/Makefile.am +++ b/backends/sysdeps/Makefile.am @@ -4,6 +4,12 @@ INCLUDES = @INCLUDES@ backenddir = @LIBGTOP_BACKEND_DIR@ +if LIBGTOP_USE_GMODULE +backendlibdir = $(backenddir) +else +backendlibdir = $(libdir) +endif + dynamic_ldflags = @libgtop_dynamic_ldflags@ backend_DATA = \ @@ -12,7 +18,7 @@ backend_DATA = \ noinst_HEADERS = \ glibtop-backend-private.h -backend_LTLIBRARIES = \ +backendlib_LTLIBRARIES = \ libgtop_backend_sysdeps.la libgtop_backend_sysdeps_la_SOURCES = \ diff --git a/sysdeps/solaris/ChangeLog b/sysdeps/solaris/ChangeLog index aaf574db..5f6ebc22 100644 --- a/sysdeps/solaris/ChangeLog +++ b/sysdeps/solaris/ChangeLog @@ -1,3 +1,8 @@ +2000-02-22 Martin Baulig + + * Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR) + when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise. + 2000-02-16 Martin Baulig * Makefile.am: Install libraries in $(backenddir). diff --git a/sysdeps/solaris/Makefile.am b/sysdeps/solaris/Makefile.am index 2d6c26bc..1eda61b7 100644 --- a/sysdeps/solaris/Makefile.am +++ b/sysdeps/solaris/Makefile.am @@ -6,7 +6,13 @@ dynamic_ldflags = @libgtop_dynamic_ldflags@ backenddir = @LIBGTOP_BACKEND_DIR@ -backend_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la +if LIBGTOP_USE_GMODULE +backendlibdir = $(backenddir) +else +backendlibdir = $(libdir) +endif + +backendlib_LTLIBRARIES = libgtop_sysdeps.la libgtop_sysdeps_suid.la libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c \ safeio.c swap.c uptime.c loadavg.c \