parallel install for gnome-libs

[Havoc Pennington <hp redhat com>]

Hi,

This handles moving the headers to includedir/gnome-1.0; there may be
other issues that arise on parallel install, I'm currently
experimenting.

This patch is the obviously necessary fix, however. I went with
putting everything under includedir/gnome-1.0 to keep GNOME_LIBDIR a
single -L flag and try to KISS. (as opposed to
includedir/libgnome-1.0, includedir/libzvt-1.0, etc.)

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/ChangeLog,v
retrieving revision 1.463.4.53
diff -u -p -u -r1.463.4.53 ChangeLog
--- ChangeLog	2001/09/11 06:41:37	1.463.4.53
+++ ChangeLog	2001/09/13 18:55:52
@@ -1,3 +1,12 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (gnomeincludedir): move gnome.h to includedir/gnome-1.0
+
+	* libgnorba/Makefile.am (libgnorbaincludedir): move to
+	includedir/gnome-1.0
+
+	* configure.in (GNOME_INCLUDEDIR): change to includedir/gnome-1.0
+
 2001-09-11  Kjartan Maraas  <kmaraas gnome org>
 
 	* configure.in: Fix typo. s/$LDFLAGBS/$LDFLAGS in gmodule check.
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/Makefile.am,v
retrieving revision 1.49.4.1
diff -u -p -u -r1.49.4.1 Makefile.am
--- Makefile.am	2000/11/09 20:29:13	1.49.4.1
+++ Makefile.am	2001/09/13 18:55:52
@@ -19,7 +19,8 @@ SUBDIRS = po intl support macros \
 	libgnome libgnomeui gtk-xmhtml zvt \
 	libgnorba idl $(test_gnome) devel-docs gnome-data man
 
-include_HEADERS = gnome.h
+gnomeincludedir=$(includedir)/gnome-1.0
+gnomeinclude_HEADERS = gnome.h
 
 EXTRA_DIST =	HACKING gnomeConf.sh.in gnome-bug.in gnome-config.in \
 		gnome-libs.spec.in
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnome-libs/configure.in,v
retrieving revision 1.241.4.43
diff -u -p -u -r1.241.4.43 configure.in
--- configure.in	2001/09/11 06:41:37	1.241.4.43
+++ configure.in	2001/09/13 18:55:52
@@ -391,7 +391,7 @@ ZVT_LIBS="-lzvt $UTIL_LIBS $GTK_LIBS"
 
 dnl These definitions are expanded in make and gnome-config
 GNOME_LIBDIR='-L${libdir}'
-GNOME_INCLUDEDIR='-I${includedir} -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
+GNOME_INCLUDEDIR='-I${includedir}/gnome-1.0 -DNEED_GNOMESUPPORT_H -I${pkglibdir}/include'
 GNOME_IDLDIR='-I${datadir}/idl'
 
 dnl
Index: gtk-xmhtml/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/gtk-xmhtml/Attic/ChangeLog,v
retrieving revision 1.41.4.1
diff -u -p -u -r1.41.4.1 ChangeLog
--- gtk-xmhtml/ChangeLog	2000/06/21 19:26:01	1.41.4.1
+++ gtk-xmhtml/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libgtkxmhtmlincludedir): move to includedir/gnome-1.0
+
 2000-06-21  Kjartan Maraas  <kmaraas gnome org>
 
 	* images.c: Fix a warning by initializing a var to NULL.
Index: gtk-xmhtml/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/gtk-xmhtml/Attic/Makefile.am,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile.am
--- gtk-xmhtml/Makefile.am	1999/02/25 04:21:50	1.14
+++ gtk-xmhtml/Makefile.am	2001/09/13 18:55:53
@@ -1,6 +1,6 @@
 ## Procesed by automake to procduce Makefile.in
 
-libgtkxmhtmlincludedir = $(includedir)/gtk-xmhtml
+libgtkxmhtmlincludedir = $(includedir)/gnome-1.0/gtk-xmhtml
 
 INCLUDES = -I.. -I$(srcdir)/.. -I$(includedir) @GTK_CFLAGS@ \
            -DWITH_GTK -DDEBUG -DGNOME_LIB
Index: libart_lgpl/ChangeLog
===================================================================
RCS file: /cvs/gnome/libart_lgpl/ChangeLog,v
retrieving revision 1.42.4.14
diff -u -p -u -r1.42.4.14 ChangeLog
--- libart_lgpl/ChangeLog	2001/08/21 03:40:15	1.42.4.14
+++ libart_lgpl/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libart_lgplincdir): move to includedir/gnome-1.0
+
 2001-06-14  Miguel de Icaza  <miguel ximian com>
 
 	* Makefile.am: add -lm to the link line, so applications get this
Index: libart_lgpl/Makefile.am
===================================================================
RCS file: /cvs/gnome/libart_lgpl/Makefile.am,v
retrieving revision 1.17.6.4
diff -u -p -u -r1.17.6.4 Makefile.am
--- libart_lgpl/Makefile.am	2001/08/07 22:35:53	1.17.6.4
+++ libart_lgpl/Makefile.am	2001/09/13 18:55:53
@@ -56,7 +56,7 @@ libart_lgpl_la_SOURCES = \
 libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
 libart_lgpl_la_LIBADD = -lm
 
-libart_lgplincdir = $(includedir)/libart_lgpl
+libart_lgplincdir = $(includedir)/gnome-1.0/libart_lgpl
 libart_lgplinc_HEADERS = \
 	art_affine.h \
 	art_alphagamma.h \
Index: libgnome/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/Attic/ChangeLog,v
retrieving revision 1.100.4.48
diff -u -p -u -r1.100.4.48 ChangeLog
--- libgnome/ChangeLog	2001/08/31 04:50:26	1.100.4.48
+++ libgnome/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libgnomeincludedir): move to includedir/gnome-1.0
+
 2001-08-30  Darin Adler  <darin bentspoon com>
 
 	* gnome-metadata.c: (gnome_metadata_get),
Index: libgnome/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnome/Attic/Makefile.am,v
retrieving revision 1.92.4.10
diff -u -p -u -r1.92.4.10 Makefile.am
--- libgnome/Makefile.am	2001/04/18 19:37:13	1.92.4.10
+++ libgnome/Makefile.am	2001/09/13 18:55:53
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libgnome.la
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-libgnomeincludedir = $(includedir)/libgnome
+libgnomeincludedir = $(includedir)/gnome-1.0/libgnome
 
 INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
Index: libgnomeui/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/Attic/ChangeLog,v
retrieving revision 1.1161.4.124
diff -u -p -u -r1.1161.4.124 ChangeLog
--- libgnomeui/ChangeLog	2001/08/21 22:15:36	1.1161.4.124
+++ libgnomeui/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libgnomeuiincludedir): move to includedir/gnome-1.0
+
 2001-08-21  Chris Toshok  <toshok ximian com>
 
 	* gnome-canvas.c (gnome_canvas_button): if there's an active
Index: libgnomeui/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnomeui/Attic/Makefile.am,v
retrieving revision 1.165.4.15
diff -u -p -u -r1.165.4.15 Makefile.am
--- libgnomeui/Makefile.am	2001/02/16 05:16:59	1.165.4.15
+++ libgnomeui/Makefile.am	2001/09/13 18:55:53
@@ -12,7 +12,7 @@ lib_LTLIBRARIES = libgnomeui.la
 #
 # Install location for header files
 #
-libgnomeuiincludedir = $(includedir)/libgnomeui
+libgnomeuiincludedir = $(includedir)/gnome-1.0/libgnomeui
 
 INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS) \
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl \
Index: libgnorba/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/libgnorba/Attic/Makefile.am,v
retrieving revision 1.52
diff -u -p -u -r1.52 Makefile.am
--- libgnorba/Makefile.am	1999/09/20 20:47:38	1.52
+++ libgnorba/Makefile.am	2001/09/13 18:55:53
@@ -4,7 +4,7 @@ lib_LTLIBRARIES = libgnorba.la libgnorba
 
 LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 
-libgnorbaincludedir = $(includedir)/libgnorba
+libgnorbaincludedir = $(includedir)/gnome-1.0/libgnorba
 
 EXTRA_DIST = yes.xpm no.xpm
 
Index: support/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-common/support/ChangeLog,v
retrieving revision 1.62.6.2
diff -u -p -u -r1.62.6.2 ChangeLog
--- support/ChangeLog	2001/06/15 00:01:56	1.62.6.2
+++ support/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (gnomeincludedir): move popt-gnome.h to includedir/gnome-1.0
+
 2001-06-14  Miguel de Icaza  <miguel ximian com>
 
 	From David KAELBLING:
Index: support/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-common/support/Makefile.am,v
retrieving revision 1.26
diff -u -p -u -r1.26 Makefile.am
--- support/Makefile.am	1999/03/27 22:31:28	1.26
+++ support/Makefile.am	2001/09/13 18:55:53
@@ -16,7 +16,8 @@ noinst_HEADERS = gnomesupport-fake.h \
 		 findme.h poptint.h
 
 # Hmm... should we move `error.h' here.
-include_HEADERS = popt-gnome.h
+gnomeincludedir=$(includedir)/gnome-1.0
+gnomeinclude_HEADERS = popt-gnome.h
 
 popt_sources = findme.c poptconfig.c poptparse.c popt.c popthelp.c
 
Index: zvt/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-libs/zvt/ChangeLog,v
retrieving revision 1.262.4.29
diff -u -p -u -r1.262.4.29 ChangeLog
--- zvt/ChangeLog	2001/06/15 00:04:52	1.262.4.29
+++ zvt/ChangeLog	2001/09/13 18:55:53
@@ -1,3 +1,7 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am (libzvtincludedir): move to includedir/gnome-1.0
+
 2001-06-14  Miguel de Icaza  <miguel ximian com>
 
 	* subshell-includes.h: From Dan McNichol: IBM compiler defines
Index: zvt/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnome-libs/zvt/Makefile.am,v
retrieving revision 1.33.4.4
diff -u -p -u -r1.33.4.4 Makefile.am
--- zvt/Makefile.am	2001/01/21 22:36:49	1.33.4.4
+++ zvt/Makefile.am	2001/09/13 18:55:53
@@ -2,7 +2,7 @@ sbin_PROGRAMS    = gnome-pty-helper
 lib_LTLIBRARIES  = libzvt.la
 noinst_PROGRAMS  = zterm test-utmp
 
-libzvtincludedir = $(includedir)/zvt
+libzvtincludedir = $(includedir)/gnome-1.0/zvt
 
 INCLUDES = -I.. -I$(srcdir)/.. $(SUPPORTINCS)		\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\