[Libwpg-cvs] libwpg libwpg-stream-1.pc.in, NONE, 1.1 Makefile.am, 1.3, 1.4 configure.in, 1.4, 1.5 libwpg-1.pc.in, 1.1, 1.2

[Fridrich S. <str...@us...>]

Update of /cvsroot/libwpg/libwpg
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8436

Modified Files:
	Makefile.am configure.in libwpg-1.pc.in 
Added Files:
	libwpg-stream-1.pc.in 
Log Message:
Separate stream implementation from the rest of the library


--- NEW FILE: libwpg-stream-1.pc.in ---
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
                                                                       
Name: libwpg-stream-1
Description: Library for importing and converting Corel WordPerfect(tm) Graphics images
Version: @VERSION@
Requires: libwpg-1
Libs: -L${libdir} -lwpg-stream-1
Cflags: -I${includedir}/libwpg-1

Index: configure.in
===================================================================
RCS file: /cvsroot/libwpg/libwpg/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.in	18 Jun 2006 07:24:51 -0000	1.4
+++ configure.in	18 Jun 2006 14:43:57 -0000	1.5
@@ -48,12 +48,14 @@
   *-*-mingw*)
     native_win32=yes
     LIBWPG_WIN32_RESOURCE=libwpg-win32res.lo
+    LIBWPG_STREAM_WIN32_RESOURCE=libwpg-stream-win32res.lo
     WPG2RAW_WIN32_RESOURCE=wpg2raw-win32res.lo
     WPG2SVG_WIN32_RESOURCE=wpg2svg-win32res.lo
     ;;
   *)
     native_win32=no
     LIBWPG_WIN32_RESOURCE=
+    LIBWPG_STREAM_WIN32_RESOURCE=
     WPG2RAW_WIN32_RESOURCE=
     WPG2SVG_WIN32_RESOURCE=
     ;;
@@ -61,6 +63,7 @@
 AC_MSG_RESULT([$native_win32])
 AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes)
 AC_SUBST(LIBWPG_WIN32_RESOURCE)
+AC_SUBST(LIBWPG_STREAM_WIN32_RESOURCE)
 AC_SUBST(WPG2RAW_WIN32_RESOURCE)
 AC_SUBST(WPG2SVG_WIN32_RESOURCE)
 
@@ -142,9 +145,11 @@
 src/conv/svg/wpg2svg.rc
 src/lib/Makefile
 src/lib/libwpg.rc
+src/lib/libwpg-stream.rc
 build/Makefile
 build/win32/Makefile
 libwpg-1.pc
+libwpg-stream-1.pc
 libwpg.spec
 ])
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libwpg/libwpg/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	26 Jan 2005 09:51:27 -0000	1.3
+++ Makefile.am	18 Jun 2006 14:43:57 -0000	1.4
@@ -1,6 +1,6 @@
 pkgconfdir = $(libdir)/pkgconfig
 
-pkgconf_DATA = libwpg-1.pc
+pkgconf_DATA = libwpg-1.pc libwpg-stream-1.pc
 
 SUBDIRS = src build
 

Index: libwpg-1.pc.in
===================================================================
RCS file: /cvsroot/libwpg/libwpg/libwpg-1.pc.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libwpg-1.pc.in	28 Jan 2004 13:01:35 -0000	1.1
+++ libwpg-1.pc.in	18 Jun 2006 14:43:57 -0000	1.2
@@ -6,6 +6,5 @@
 Name: libwpg-1
 Description: Library for importing and converting Corel WordPerfect(tm) Graphics images
 Version: @VERSION@
-Requires: libgsf-1
 Libs: -L${libdir} -lwpg-1
 Cflags: -I${includedir}/libwpg-1