Only install the libs in $(LIBGTOP_BACKEND_DIR) when we

2000-02-22  Martin Baulig  <martin@home-of-linux.org>

	* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
	when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
This commit is contained in:
Martin Baulig
2000-02-22 21:01:14 +00:00
committed by Martin Baulig
parent fa20de8904
commit 5f0246b07d
8 changed files with 48 additions and 4 deletions

View File

@@ -1,3 +1,8 @@
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
2000-01-12 Martin Baulig <martin@home-of-linux.org> 2000-01-12 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR). * Makefile.am: Install everything in $(LIBGTOP_BACKEND_DIR).

View File

@@ -4,6 +4,12 @@ INCLUDES = @INCLUDES@
backenddir = @LIBGTOP_BACKEND_DIR@ backenddir = @LIBGTOP_BACKEND_DIR@
if LIBGTOP_USE_GMODULE
backendlibdir = $(backenddir)
else
backendlibdir = $(libdir)
endif
dynamic_ldflags = @libgtop_dynamic_ldflags@ dynamic_ldflags = @libgtop_dynamic_ldflags@
backend_DATA = \ backend_DATA = \
@@ -12,7 +18,7 @@ backend_DATA = \
noinst_HEADERS = \ noinst_HEADERS = \
glibtop-backend-private.h glibtop-backend-private.h
backend_LTLIBRARIES = \ backendlib_LTLIBRARIES = \
libgtop_backend_common.la libgtop_backend_common.la
libgtop_backend_common_la_SOURCES = \ libgtop_backend_common_la_SOURCES = \

View File

@@ -1,3 +1,8 @@
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
2000-01-18 Martin Baulig <martin@home-of-linux.org> 2000-01-18 Martin Baulig <martin@home-of-linux.org>
* demarshal.pl: Only emit code for functions which are * demarshal.pl: Only emit code for functions which are

View File

@@ -7,6 +7,12 @@ INCLUDES = @INCLUDES@ -D_BSD \
backenddir = @LIBGTOP_BACKEND_DIR@ backenddir = @LIBGTOP_BACKEND_DIR@
if LIBGTOP_USE_GMODULE
backendlibdir = $(backenddir)
else
backendlibdir = $(libdir)
endif
dynamic_ldflags = @libgtop_dynamic_ldflags@ dynamic_ldflags = @libgtop_dynamic_ldflags@
backend_DATA = \ backend_DATA = \
@@ -15,7 +21,7 @@ backend_DATA = \
noinst_HEADERS = \ noinst_HEADERS = \
glibtop-backend-private.h glibtop-backend-private.h
backend_LTLIBRARIES = \ backendlib_LTLIBRARIES = \
libgtop_backend_server.la libgtop_backend_server.la
bin_PROGRAMS = \ bin_PROGRAMS = \

View File

@@ -1,3 +1,8 @@
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
2000-01-22 Martin Baulig <martin@home-of-linux.org> 2000-01-22 Martin Baulig <martin@home-of-linux.org>
* libgtop-sysdeps.backend: Added "ExtraLibs" section to * libgtop-sysdeps.backend: Added "ExtraLibs" section to

View File

@@ -4,6 +4,12 @@ INCLUDES = @INCLUDES@
backenddir = @LIBGTOP_BACKEND_DIR@ backenddir = @LIBGTOP_BACKEND_DIR@
if LIBGTOP_USE_GMODULE
backendlibdir = $(backenddir)
else
backendlibdir = $(libdir)
endif
dynamic_ldflags = @libgtop_dynamic_ldflags@ dynamic_ldflags = @libgtop_dynamic_ldflags@
backend_DATA = \ backend_DATA = \
@@ -12,7 +18,7 @@ backend_DATA = \
noinst_HEADERS = \ noinst_HEADERS = \
glibtop-backend-private.h glibtop-backend-private.h
backend_LTLIBRARIES = \ backendlib_LTLIBRARIES = \
libgtop_backend_sysdeps.la libgtop_backend_sysdeps.la
libgtop_backend_sysdeps_la_SOURCES = \ libgtop_backend_sysdeps_la_SOURCES = \

View File

@@ -1,3 +1,8 @@
2000-02-22 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Only install the libs in $(LIBGTOP_BACKEND_DIR)
when we LIBGTOP_USE_GMODULE and in $(libdir) otherwise.
2000-02-16 Martin Baulig <martin@home-of-linux.org> 2000-02-16 Martin Baulig <martin@home-of-linux.org>
* Makefile.am: Install libraries in $(backenddir). * Makefile.am: Install libraries in $(backenddir).

View File

@@ -6,7 +6,13 @@ dynamic_ldflags = @libgtop_dynamic_ldflags@
backenddir = @LIBGTOP_BACKEND_DIR@ 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 \ libgtop_sysdeps_la_SOURCES = open.c close.c cpu.c mem.c \
safeio.c swap.c uptime.c loadavg.c \ safeio.c swap.c uptime.c loadavg.c \