libart parallel install

[Havoc Pennington <hp redhat com>]

Hi,

Here's the patch for libart. I'm not sure who reviews libart patches?

libart does not technically need rename action I don't think, because
it is binary compatible in gnome 1.0 and 2.0. However given the
packaging we had in 1.0 (bundled with gnome-libs), the renaming makes
things a lot easier for people, so I think it makes sense.

I just dumped libart.m4 and libartConf.sh. Maybe we should also dump
libart2-config.

If no one claims they are in charge of libart in the near future I'll
probably just assume it's one of those free-for-all modules. ;-)

Havoc

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libart_lgpl/ChangeLog,v
retrieving revision 1.70
diff -u -p -u -r1.70 ChangeLog
--- ChangeLog	2001/08/03 12:42:02	1.70
+++ ChangeLog	2001/09/13 19:27:01
@@ -1,3 +1,15 @@
+2001-09-13  Havoc Pennington  <hp redhat com>
+
+	* Makefile.am: rename library to libart_lgpl_2
+
+	* libart-2.0.pc.in (Cflags): move includes
+
+	* libart-config.in: move includes
+
+	* Makefile.am: delete libartConf.sh, rename libart-config
+	(EXTRA_DIST): don't install m4 files
+	(libart_lgplincdir): move headers
+
 2001-08-03  Michael Meeks  <michael ximian com>
 
 	* Version 2.3.5 for the API freeze.
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/libart_lgpl/Makefile.am,v
retrieving revision 1.24
diff -u -p -u -r1.24 Makefile.am
--- Makefile.am	2001/03/24 02:20:04	1.24
+++ Makefile.am	2001/09/13 19:27:01
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = testart testuta gen_art_config
 
 bin_SCRIPTS = \
-	libart-config
+	libart2-config
 
 BUILT_SOURCES = art_config.h
 
@@ -9,14 +9,12 @@ art_config.h:	gen_art_config
 	./gen_art_config > art_config.h
 
 EXTRA_DIST = 			\
-	libart.m4		\
-	libartConf.sh.in	\
 	libart-config.in	\
 	libart-2.0.pc.in
 
-lib_LTLIBRARIES = libart_lgpl.la
+lib_LTLIBRARIES = libart_lgpl_2.la
 
-libart_lgpl_la_SOURCES = \
+libart_lgpl_2_la_SOURCES = \
 	art_affine.c \
 	art_alphagamma.c \
 	art_bpath.c \
@@ -57,9 +55,9 @@ libart_lgpl_la_SOURCES = \
 	art_vpath_svp.c	\
 	libart-features.c
 
-libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
+libart_lgpl_2_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@
 
-libart_lgplincdir = $(includedir)/libart_lgpl
+libart_lgplincdir = $(includedir)/libart-2.0/libart_lgpl
 libart_lgplinc_HEADERS = \
 	art_affine.h \
 	art_alphagamma.h \
@@ -106,8 +104,8 @@ libart_lgplinc_HEADERS = \
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DLIBART_COMPILATION
 
-DEPS = $(top_builddir)/libart_lgpl.la
-LDADDS = $(top_builddir)/libart_lgpl.la
+DEPS = $(top_builddir)/libart_lgpl_2.la
+LDADDS = $(top_builddir)/libart_lgpl_2.la
 
 testart_SOURCES=testart.c
 testart_LDFLAGS =
@@ -121,27 +119,8 @@ testuta_LDADD = $(LDADDS) -lm
 
 tests:	testart testuta
 
-m4datadir = $(datadir)/aclocal
-m4data_DATA = libart.m4
-
-## Put `exec' in the name because this should be installed by
-## `install-exec', not `install-data'.
-
-confexecdir=$(libdir)
-confexec_DATA = libartConf.sh
-
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libart-2.0.pc
 
-## We create libartConf.sh here and not from configure because we want
-## to get the paths expanded correctly.  Macros like srcdir are given
-## the value NONE in configure if the user doesn't specify them (this
-## is an autoconf feature, not a bug).
-
-libartConf.sh: libartConf.sh.in Makefile
-## Use sed and then mv to avoid problems if the user interrupts.
-	sed -e 's?\ LIBART_LIBDIR\@?$(LIBART_LIBDIR)?g' \
-	    -e 's?\ LIBART_INCLUDEDIR\@?$(LIBART_INCLUDEDIR)?g' \
-	    -e 's?\ LIBART_LIBS\@?$(LIBART_LIBS)?g' \
-	      < $(srcdir)/libartConf.sh.in > libartConf.tmp \
-	  && mv libartConf.tmp libartConf.sh
+libart2-config: libart-config
+	cp -f libart-config libart2-config
\ No newline at end of file
Index: libart-2.0.pc.in
===================================================================
RCS file: /cvs/gnome/libart_lgpl/libart-2.0.pc.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 libart-2.0.pc.in
--- libart-2.0.pc.in	2000/09/30 14:41:50	1.1
+++ libart-2.0.pc.in	2001/09/13 19:27:01
@@ -6,5 +6,5 @@ includedir= includedir@
 Name: libart
 Description: LGPL version of the libart library
 Version: @VERSION@
-Libs: -L${libdir} -lart_lgpl
-Cflags: -I${includedir}
+Libs: -L${libdir} -lart_lgpl_2
+Cflags: -I${includedir}/libart-2.0
Index: libart-config.in
===================================================================
RCS file: /cvs/gnome/libart_lgpl/libart-config.in,v
retrieving revision 1.1
diff -u -p -u -r1.1 libart-config.in
--- libart-config.in	1998/11/19 04:54:18	1.1
+++ libart-config.in	2001/09/13 19:27:01
@@ -39,14 +39,12 @@ while test $# -gt 0; do
       echo @LIBART_VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I includedir@
-      fi
+      includes=-I includedir@/libart-2.0
       echo $includes
       ;;
     --libs)
       libdirs=-L libdir@
-      echo $libdirs -lart_lgpl -lm
+      echo $libdirs -lart_lgpl_2 -lm
       ;;
     *)
       echo "${usage}" 1>&2