oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install only one library, libgtop-2.0 Fix build-time warnings due to the

Browse Source 
2003-10-21  Bastien Nocera  <hadess@hadess.net>

	* Makefile.am:
	* configure.in:
	* src/inodedb/.cvsignore:
	* sysdeps/names/Makefile.am:
	install only one library, libgtop-2.0
	Fix build-time warnings due to the redefinition of guint64
This commit is contained in:
Bastien Nocera
2003-10-21 21:21:28 +00:00
committed by Bastien Nocera
parent 58b323cfab
commit 31133cc3dc
30 changed files with 101 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* configure.in:
* src/inodedb/.cvsignore:
* sysdeps/names/Makefile.am:
install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* lib/read.c: (glibtop_read_l):

13
Makefile.am
View File

@@ -1,13 +1,5 @@
## Process this file with automake to produce Makefile.in.
if EXAMPLES
examples_SUBDIRS = examples
else
examples_SUBDIRS =
endif
SUBDIRS = . po misc include sysdeps lib src \
$(examples_SUBDIRS) doc
SUBDIRS = po misc include sysdeps lib src examples doc
libgtopinclude_HEADERS = glibtop.h
libgtopincludedir = $(includedir)/libgtop-2.0
@@ -20,9 +12,6 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
dist-hook:
cp libgtop.spec $(distdir)
release:
$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libgtop-2.0.pc

2
configure.in
View File

@@ -317,7 +317,7 @@ fi
LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0"
LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
LIBGTOP_LIBS="$LIBGTOP_LIBS"

8
examples/ChangeLog
View File

@@ -1,3 +1,11 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* smp.c:
* sysdeps.c: (main): install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
Fix building smp.c and sysdeps.c
2003-10-20 Bastien Nocera <hadess@hadess.net>
* first.c:

41
examples/Makefile.am
View File

@@ -6,12 +6,7 @@ INCLUDES = @INCLUDES@
DEFS = @DEFS@
# We install it in `libexec' since this will make it more easy
# to put the examples into an extra RPM package.
libgtopdir = $(libexecdir)/libgtop
libgtop_PROGRAMS = first second\
noinst_PROGRAMS = first second\
mountlist procmap netload sysdeps timings \
@static_targets@ @smp_examples@
@@ -22,45 +17,35 @@ EXTRA_PROGRAMS = first_static second_static \
timings_static
first_SOURCES = first.c
first_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
first_LDADD = $(top_builddir)/lib/libgtop-2.0.la
first_static_SOURCES = $(first_SOURCES)
first_static_LDADD = $(first_LDADD)
first_static_LDFLAGS = -static
second_SOURCES = second.c
second_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
second_LDADD = $(top_builddir)/lib/libgtop-2.0.la
second_static_SOURCES = $(second_SOURCES)
second_static_LDADD = $(second_LDADD)
second_static_LDFLAGS = -static
procmap_SOURCES = procmap.c
procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
procmap_LDADD = $(top_builddir)/lib/libgtop-2.0.la
procmap_static_SOURCES = $(procmap_SOURCES)
procmap_static_LDADD = $(procmap_LDADD)
procmap_static_LDFLAGS = -static
netload_SOURCES = netload.c
netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
netload_LDADD = $(top_builddir)/lib/libgtop-2.0.la
netload_static_SOURCES = $(netload_SOURCES)
netload_static_LDADD = $(netload_LDADD)
netload_static_LDFLAGS = -static
sysdeps_SOURCES = sysdeps.c
sysdeps_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
sysdeps_LDADD = $(top_builddir)/lib/libgtop-2.0.la
sysdeps_static_SOURCES = $(sysdeps_SOURCES)
sysdeps_static_LDADD = $(sysdeps_LDADD)
@@ -71,8 +56,6 @@ third_names_LIBS = $(top_builddir)/sysdeps/names/libgtop_names-2.0.la
third_SOURCES = third.c
third_LDADD = $(third_names_LIBS) \
$(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
@INTLLIBS@
third_static_SOURCES = $(third_SOURCES)
@@ -80,9 +63,7 @@ third_static_LDADD = $(third_LDADD)
third_static_LDFLAGS = -static
mountlist_SOURCES = mountlist.c
mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
mountlist_LDADD = $(top_builddir)/lib/libgtop-2.0.la
mountlist_static_SOURCES= $(mountlist_SOURCES)
mountlist_static_LDADD = $(mountlist_LDADD)
@@ -90,18 +71,14 @@ mountlist_static_LDFLAGS= -static
smp_SOURCES = smp.c
smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
smp_LDADD = $(top_builddir)/lib/libgtop-2.0.la
smp_static_SOURCES = $(smp_SOURCES)
smp_static_LDADD = $(smp_LDADD)
smp_static_LDFLAGS = -static
timings_SOURCES = timings.c
timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la
timings_LDADD = $(top_builddir)/lib/libgtop-2.0.la
timings_static_SOURCES = $(timings_SOURCES)
timings_static_LDADD = $(timings_LDADD)

4
examples/smp.c
View File

@@ -21,12 +21,16 @@
Boston, MA 02111-1307, USA.
*/
#include <config.h>
#include <locale.h>
#include <math.h>
#include <glibtop.h>
#include <glibtop/cpu.h>
#include <libgnome/gnome-i18n.h>
int
main (int argc, char *argv [])
{

3
examples/sysdeps.c
View File

@@ -26,6 +26,7 @@
#include <glibtop.h>
#include <glibtop/open.h>
#include <glibtop/close.h>
#include <glibtop/sysdeps.h>
#include <glibtop/parameter.h>
@@ -68,7 +69,7 @@ main (int argc, char *argv [])
glibtop_get_sysdeps (&sysdeps);
#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)
#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0)
printf ("Sysdeps (0x%08lx):\n\n"
"\tfeatures:\t\t0x%08lx\n\n"

4
src/inodedb/.cvsignore
View File

@@ -1,5 +1,5 @@
Makefile.in
Makefile
mkinodedb
file_by_inode
mkinodedb2
file_by_inode2
.deps

5
sysdeps/aix/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* procsignal.c: (glibtop_get_proc_signal_s): s/u_int64_t/guint64/

3
sysdeps/aix/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = siglist.c nosuid.c

7
sysdeps/common/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* fsusage.h: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
Include glib.h for the definition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* inodedb.c: (glibtop_inodedb_close_s): fix compilation, thanks Jeff

3
sysdeps/common/Makefile.am
View File

@@ -1,4 +1,3 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
@@ -12,7 +11,7 @@ endif
CFLAGS = @CFLAGS@ $(inodedb_DEFS)
lib_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la
noinst_LTLIBRARIES = libgtop_common-2.0.la libgtop_suid_common-2.0.la
libgtop_common_2_0_la_SOURCES = error.c gnuslib.c \
fsusage.c fsusage.h mountlist.c mountlist.h \

2
sysdeps/common/fsusage.h
View File

@@ -15,6 +15,8 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <glib.h>
/* Space usage statistics for a filesystem. Blocks are 512-byte. */
struct fs_usage
{

5
sysdeps/freebsd/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* mem.c: (glibtop_get_mem_p):

3
sysdeps/freebsd/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c

5
sysdeps/kernel/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_private.h: s/u_int64_t/guint64/

3
sysdeps/kernel/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c kernel.s cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \

5
sysdeps/linux/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_server.h:

3
sysdeps/linux/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \

3
sysdeps/names/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_names-2.0.la
noinst_LTLIBRARIES = libgtop_names-2.0.la
libgtop_names_2_0_la_SOURCES = cpu.c mem.c swap.c uptime.c loadavg.c \
shm_limits.c msg_limits.c sem_limits.c \

5
sysdeps/osf1/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_server.h:

3
sysdeps/osf1/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \

5
sysdeps/solaris/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* shm_limits.c: (glibtop_get_shm_limits_p): Apply patch by

3
sysdeps/solaris/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c \
safeio.c swap.c uptime.c loadavg.c \

5
sysdeps/stub/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_server.h:

3
sysdeps/stub/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \

5
sysdeps/stub_suid/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_machine.h:

3
sysdeps/stub_suid/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c

5
sysdeps/sun4/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-21 Bastien Nocera <hadess@hadess.net>
* Makefile.am: install only one library, libgtop-2.0
Fix build-time warnings due to the redefinition of guint64
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_machine.h:

3
sysdeps/sun4/Makefile.am
View File

@@ -1,8 +1,7 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@
lib_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)