Re: gnome-utils porting report

["R.I.P. Deaddog" <maddog linuxhall org>]

On 15 Oct 2001, Havoc Pennington wrote:

> > The required patches have been done; but seems that nobody was maintaining
> > and developing it (both 1.0.x and 1.1.x) so that I didn't commit those
> > patches. Anybody wanna have a look?
>
> Post 'em here, if no one sees problems let's put them in.

Patch for libgtop 1.0.x attached, it's fairly strict forward -- just moving
headers. 1.1.x is *much* more complex (due to conflicting lib names), and
need a little bit of time for cleaning up and testing.

Will post the patch for 1.1.x once it's done.

Abel

diff -ur libgtop-1.0.12-orig/configure.in libgtop-1.0.12/configure.in
--- libgtop-1.0.12-orig/configure.in	Tue Feb 27 21:20:02 2001
+++ libgtop-1.0.12/configure.in	Sat Oct 13 14:31:16 2001
@@ -338,7 +338,7 @@
 
 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 -ur libgtop-1.0.12-orig/include/glibtop/Makefile.am libgtop-1.0.12/include/glibtop/Makefile.am
--- libgtop-1.0.12-orig/include/glibtop/Makefile.am	Mon Oct 26 18:38:43 1998
+++ libgtop-1.0.12/include/glibtop/Makefile.am	Sat Oct 13 14:31:46 2001
@@ -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 \
--- libgtop-1.0.12-orig/Makefile.am	Thu Feb 15 07:48:16 2001
+++ libgtop-1.0.12/Makefile.am	Sat Oct 13 16:33:12 2001
@@ -13,7 +13,8 @@
 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 @@
 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' \
--- libgtop-1.0.12-orig/sysdeps/linux/Makefile.am	Tue Feb 16 23:13:17 1999
+++ libgtop-1.0.12/sysdeps/linux/Makefile.am	Sat Oct 13 16:41:17 2001
@@ -14,4 +14,5 @@
 
 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
--- libgtop-1.0.12-orig/sysdeps/kernel/Makefile.am	Tue Feb 16 23:13:15 1999
+++ libgtop-1.0.12/sysdeps/kernel/Makefile.am	Sat Oct 13 16:42:45 2001
@@ -13,7 +13,8 @@
 
 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
 
--- libgtop-1.0.12-orig/sysdeps/freebsd/Makefile.am	Tue Feb 16 23:13:09 1999
+++ libgtop-1.0.12/sysdeps/freebsd/Makefile.am	Sat Oct 13 16:43:13 2001
@@ -17,6 +17,6 @@
 
 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
--- libgtop-1.0.12-orig/sysdeps/osf1/Makefile.am	Sat Feb 20 05:32:46 1999
+++ libgtop-1.0.12/sysdeps/osf1/Makefile.am	Sat Oct 13 16:44:21 2001
@@ -17,6 +17,7 @@
 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
--- libgtop-1.0.12-orig/sysdeps/solaris/Makefile.am	Thu Feb 15 07:48:48 2001
+++ libgtop-1.0.12/sysdeps/solaris/Makefile.am	Sat Oct 13 16:44:53 2001
@@ -21,6 +21,8 @@
 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
 
--- libgtop-1.0.12-orig/sysdeps/sun4/Makefile.am	Tue Feb 16 23:13:26 1999
+++ libgtop-1.0.12/sysdeps/sun4/Makefile.am	Sat Oct 13 16:45:15 2001
@@ -16,6 +16,7 @@
 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
--- libgtop-1.0.12-orig/sysdeps/stub/Makefile.am	Tue Feb 16 23:13:22 1999
+++ libgtop-1.0.12/sysdeps/stub/Makefile.am	Sat Oct 13 16:46:31 2001
@@ -13,5 +13,5 @@
 
 libgtop_sysdeps_la_LDFLAGS	= $(LT_VERSION_INFO)
 
-include_HEADERS			= glibtop_server.h
-
+libgtopinclude_HEADERS		= glibtop_server.h
+libgtopincludedir		= $(includedir)/libgtop-1.0
--- libgtop-1.0.12-orig/sysdeps/stub_suid/Makefile.am	Tue Feb 16 23:13:24 1999
+++ libgtop-1.0.12/sysdeps/stub_suid/Makefile.am	Sat Oct 13 16:46:51 2001
@@ -17,6 +17,7 @@
 
 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