From aa9299f344305164e536eeb74b04240c54a1632a Mon Sep 17 00:00:00 2001 From: Kwok-Koon Cheung Date: Wed, 17 Oct 2001 03:53:56 +0000 Subject: [PATCH] Parallel installation fix {moved headers to $(includedir)/libgtop-1.0/ } --- ChangeLog | 5 +++++ Makefile.am | 5 +++-- configure.in | 2 +- include/glibtop/Makefile.am | 2 +- sysdeps/freebsd/ChangeLog | 4 ++++ sysdeps/freebsd/Makefile.am | 3 ++- sysdeps/kernel/ChangeLog | 4 ++++ sysdeps/kernel/Makefile.am | 3 ++- sysdeps/linux/ChangeLog | 4 ++++ sysdeps/linux/Makefile.am | 3 ++- sysdeps/osf1/ChangeLog | 4 ++++ sysdeps/osf1/Makefile.am | 3 ++- sysdeps/solaris/ChangeLog | 4 ++++ sysdeps/solaris/Makefile.am | 4 +++- sysdeps/stub/ChangeLog | 4 ++++ sysdeps/stub/Makefile.am | 4 ++-- sysdeps/stub_suid/ChangeLog | 4 ++++ sysdeps/stub_suid/Makefile.am | 3 ++- sysdeps/sun4/ChangeLog | 4 ++++ sysdeps/sun4/Makefile.am | 3 ++- 20 files changed, 59 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a348bfc..d58e3290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-17 Abel Chueng + + * configure.in, Makefile.am, include/glibtop/Makefile.am: headers + moved to $(includedir)/libgtop-1.0/glibtop. + 2001-09-16 Abel Chueng * configure.in: Added "zh_TW" to ALL_LINGUAS. diff --git a/Makefile.am b/Makefile.am index 58fc3b7e..e90e8414 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ endif SUBDIRS = po intl $(support) macros misc include sysdeps lib src \ $(examples_SUBDIRS) doc -include_HEADERS = glibtop.h +libgtopinclude_HEADERS = glibtop.h +libgtopincludedir = $(includedir)/libgtop-1.0 EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \ LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \ @@ -51,7 +52,7 @@ bin_SCRIPTS = $(top_builddir)/libgtop-config libgtopConf.sh: libgtopConf.sh.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)#g' \ + -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-1.0#g' \ -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \ -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \ -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \ diff --git a/configure.in b/configure.in index 08610bf3..6b67ba43 100644 --- a/configure.in +++ b/configure.in @@ -338,7 +338,7 @@ AC_SUBST(SUPPORTINCS) dnl These definitions are expanded in make. LIBGTOP_LIBS='-L$(libdir)' -LIBGTOP_INCS='-I$(includedir)' +LIBGTOP_INCS='-I$(includedir)/libgtop-1.0' if test x$libgtop_use_machine_h = xyes ; then LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_GLIBTOP_MACHINE_H" diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am index 1b89e905..5b50f51b 100644 --- a/include/glibtop/Makefile.am +++ b/include/glibtop/Makefile.am @@ -1,4 +1,4 @@ -glibtopdir = $(includedir)/glibtop +glibtopdir = $(includedir)/libgtop-1.0/glibtop glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \ sem_limits.h uptime.h command.h mem.h proclist.h \ diff --git a/sysdeps/freebsd/ChangeLog b/sysdeps/freebsd/ChangeLog index 5e7a3d12..72a89fa7 100644 --- a/sysdeps/freebsd/ChangeLog +++ b/sysdeps/freebsd/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 2001-02-27 Martin Baulig * netload.c: Comment out the `subnet' field on BSDI; this should diff --git a/sysdeps/freebsd/Makefile.am b/sysdeps/freebsd/Makefile.am index c37d3b66..a3f6c7ba 100644 --- a/sysdeps/freebsd/Makefile.am +++ b/sysdeps/freebsd/Makefile.am @@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h glibtop_machine.h \ +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h \ glibtop_suid.h +libgtopincludedir = $(includedir)/libgtop-1.0 diff --git a/sysdeps/kernel/ChangeLog b/sysdeps/kernel/ChangeLog index bfca82c0..e833f0aa 100644 --- a/sysdeps/kernel/ChangeLog +++ b/sysdeps/kernel/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 1998-10-26 Martin Baulig * netload.c: New file. Currently empty. diff --git a/sysdeps/kernel/Makefile.am b/sysdeps/kernel/Makefile.am index 0bf368c5..9c318cf8 100644 --- a/sysdeps/kernel/Makefile.am +++ b/sysdeps/kernel/Makefile.am @@ -13,7 +13,8 @@ libgtop_sysdeps_la_SOURCES = open.c close.c kernel.s cpu.c mem.c swap.c \ libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h +libgtopinclude_HEADERS = glibtop_server.h +libgtopincludedir = $(includedir)/libgtop-1.0 noinst_HEADERS = kernel.h diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog index f24e64d9..006529a2 100644 --- a/sysdeps/linux/ChangeLog +++ b/sysdeps/linux/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 2001-02-13 Martin Baulig Fix bug #14076. diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am index 9f53f63a..1d8ac1ed 100644 --- a/sysdeps/linux/Makefile.am +++ b/sysdeps/linux/Makefile.am @@ -14,4 +14,5 @@ libgtop_sysdeps_la_LIBADD = @GLIB_LIBS@ libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h glibtop_machine.h +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h +libgtopincludedir = $(includedir)/libgtop-1.0 diff --git a/sysdeps/osf1/ChangeLog b/sysdeps/osf1/ChangeLog index 97619244..76846805 100644 --- a/sysdeps/osf1/ChangeLog +++ b/sysdeps/osf1/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 1999-05-11 Martin Baulig * procstate.c: Fixed implementation of the `state' field; added diff --git a/sysdeps/osf1/Makefile.am b/sysdeps/osf1/Makefile.am index 47bfd92a..71e3b924 100644 --- a/sysdeps/osf1/Makefile.am +++ b/sysdeps/osf1/Makefile.am @@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c proclist.c \ libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_la_LIBADD = -lmach -include_HEADERS = glibtop_server.h glibtop_machine.h +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h +libgtopincludedir = $(includedir)/libgtop-1.0 noinst_HEADERS = glibtop_suid.h diff --git a/sysdeps/solaris/ChangeLog b/sysdeps/solaris/ChangeLog index c620bb8c..16c829a7 100644 --- a/sysdeps/solaris/ChangeLog +++ b/sysdeps/solaris/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 2001-02-18 Martin Baulig Applied a patch from Laszlo PETER diff --git a/sysdeps/solaris/Makefile.am b/sysdeps/solaris/Makefile.am index 6a71805f..b210470e 100644 --- a/sysdeps/solaris/Makefile.am +++ b/sysdeps/solaris/Makefile.am @@ -21,6 +21,8 @@ libgtop_sysdeps_suid_la_SOURCES = open_suid.c close_suid.c \ libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h glibtop_machine.h +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h +libgtopincludedir = $(includedir)/libgtop-1.0 + noinst_HEADERS = glibtop_private.h glibtop_suid.h safeio.h diff --git a/sysdeps/stub/ChangeLog b/sysdeps/stub/ChangeLog index 16470426..0cb0e05c 100644 --- a/sysdeps/stub/ChangeLog +++ b/sysdeps/stub/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 1998-10-26 Martin Baulig * netload.c: New file. diff --git a/sysdeps/stub/Makefile.am b/sysdeps/stub/Makefile.am index 35b8ea65..a64fa05f 100644 --- a/sysdeps/stub/Makefile.am +++ b/sysdeps/stub/Makefile.am @@ -13,5 +13,5 @@ libgtop_sysdeps_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ libgtop_sysdeps_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h - +libgtopinclude_HEADERS = glibtop_server.h +libgtopincludedir = $(includedir)/libgtop-1.0 diff --git a/sysdeps/stub_suid/ChangeLog b/sysdeps/stub_suid/ChangeLog index 0017acbd..4d7d7bec 100644 --- a/sysdeps/stub_suid/ChangeLog +++ b/sysdeps/stub_suid/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 1998-10-26 Martin Baulig * netload.c: New file. diff --git a/sysdeps/stub_suid/Makefile.am b/sysdeps/stub_suid/Makefile.am index 43245598..614adb7f 100644 --- a/sysdeps/stub_suid/Makefile.am +++ b/sysdeps/stub_suid/Makefile.am @@ -17,6 +17,7 @@ libgtop_sysdeps_suid_la_SOURCES = open.c close.c siglist.c cpu.c mem.c swap.c \ libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) -include_HEADERS = glibtop_server.h glibtop_machine.h +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h +libgtopincludedir = $(includedir)/libgtop-1.0 noinst_HEADERS = glibtop_suid.h diff --git a/sysdeps/sun4/ChangeLog b/sysdeps/sun4/ChangeLog index 48a1688a..f05eac85 100644 --- a/sysdeps/sun4/ChangeLog +++ b/sysdeps/sun4/ChangeLog @@ -1,3 +1,7 @@ +2001-10-17 Abel Cheung + + * Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop. + 1998-10-25 Martin Baulig * ppp.c: New file. diff --git a/sysdeps/sun4/Makefile.am b/sysdeps/sun4/Makefile.am index ba4d6837..785f97cc 100644 --- a/sysdeps/sun4/Makefile.am +++ b/sysdeps/sun4/Makefile.am @@ -16,6 +16,7 @@ libgtop_sysdeps_suid_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ libgtop_sysdeps_suid_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_sysdeps_suid_la_LIBADD = -lkvm -include_HEADERS = glibtop_server.h glibtop_machine.h +libgtopinclude_HEADERS = glibtop_server.h glibtop_machine.h +libgtopincludedir = $(includedir)/libgtop-1.0 noinst_HEADERS = glibtop_suid.h