[csw-devel] SF.net SVN: gar:[8850] csw/mgar/pkg/wmf/trunk/Makefile

[hson at users.sourceforge.net]

Revision: 8850
          http://gar.svn.sourceforge.net/gar/?rev=8850&view=rev
Author:   hson
Date:     2010-02-26 19:09:10 +0000 (Fri, 26 Feb 2010)

Log Message:
-----------
Put GTK loader in separate package
Make use of ful configure options

Modified Paths:
--------------
    csw/mgar/pkg/wmf/trunk/Makefile

Modified: csw/mgar/pkg/wmf/trunk/Makefile
===================================================================
--- csw/mgar/pkg/wmf/trunk/Makefile	2010-02-26 18:44:24 UTC (rev 8849)
+++ csw/mgar/pkg/wmf/trunk/Makefile	2010-02-26 19:09:10 UTC (rev 8850)
@@ -17,31 +17,40 @@
 
 SPKG_SOURCEURL = http://wvware.sourceforge.net
 
-PACKAGES = CSWwmf CSWlibwmfdevel CSWlibwmfdoc CSWwmffonts CSWlibwmf
+PACKAGES = CSWwmf CSWlibwmf CSWlibwmfdevel CSWlibwmfdoc CSWwmffonts CSWlibwmfgtk
 CATALOGNAME_CSWwmf = wmf
 CATALOGNAME_CSWlibwmf = libwmf
 CATALOGNAME_CSWlibwmfdevel = libwmf_devel
 CATALOGNAME_CSWlibwmfdoc = wmf_doc
+CATALOGNAME_CSWlibwmfgtk = libwmf_gtk
 CATALOGNAME_CSWwmffonts = wmf_fonts
 
 SPKG_DESC_CSWwmf += Library and tools for manipulating Windows metafiles
 SPKG_DESC_CSWlibwmf += Library and tools for manipulating Windows metafiles - runtime package
 SPKG_DESC_CSWlibwmfdevel += Library and tools for manipulating Windows metafiles - developer package
 SPKG_DESC_CSWlibwmfdoc += Library and tools for manipulating Windows metafiles - documentation
+SPKG_DESC_CSWlibwmfgtk += Library and tools for manipulating Windows metafiles - GTK loader
 SPKG_DESC_CSWwmffonts += Library and tools for manipulating Windows metafiles - fonts
 
-RUNTIME_DEP_PKGS_CSWwmf += CSWexpat CSWftype2 CSWggettextrt CSWglib2 CSWgtk2
+RUNTIME_DEP_PKGS_CSWwmf += CSWftype2 
 RUNTIME_DEP_PKGS_CSWwmf += CSWjpeg CSWlibx11 CSWpng CSWzlib
 RUNTIME_DEP_PKGS_CSWwmf += CSWwmffonts CSWlibwmf
+RUNTIME_DEP_PKGS_CSWwmf += CSWiconv
+RUNTIME_DEP_PKGS_CSWwmf += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWwmffonts
-RUNTIME_DEP_PKGS_CSWlibwmf += CSWexpat
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWftype2
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWjpeg
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibx11
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWpng
 RUNTIME_DEP_PKGS_CSWlibwmf += CSWzlib
+RUNTIME_DEP_PKGS_CSWlibwmf += CSWiconv
+RUNTIME_DEP_PKGS_CSWlibwmf += CSWlibxml2
 RUNTIME_DEP_PKGS_CSWlibwmfdevel += CSWlibwmf
-RUNTIME_DEP_PKGS_CSWlibwmfdoc += CSWwmf
+RUNTIME_DEP_PKGS_CSWlibwmfdoc += 
+RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWlibwmf
+RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWglib2
+RUNTIME_DEP_PKGS_CSWlibwmfgtk += CSWgtk2
 RUNTIME_DEP_PKGS_CSWwmffonts += 
 
 BUILD_DEP_PKGS += CSWgtk2devel
@@ -49,6 +58,7 @@
 PKGFILES_CSWlibwmf = $(PKGFILES_RT)
 PKGFILES_CSWlibwmfdevel = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibwmfdoc = $(sharedstatedir)/doc/.*
+PKGFILES_CSWlibwmfgtk = $(libdir).*/io-wmf.so
 PKGFILES_CSWwmffonts = $(sharedstatedir)/libwmf/fonts/.*
 
 ARCHALL_CSWwmfdoc = 1
@@ -73,7 +83,19 @@
 UPSTREAM_USE_SF = 1
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
-CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS += --with-x
+#CONFIGURE_ARGS += --with-expat=$(prefix)
+CONFIGURE_ARGS += --with-libxml2=$(prefix)
+CONFIGURE_ARGS += --with-freetype=$(prefix)
+CONFIGURE_ARGS += --with-zlib=$(prefix)
+CONFIGURE_ARGS += --with-png=$(prefix)
+CONFIGURE_ARGS += --with-jpeg=$(prefix)
+CONFIGURE_ARGS += --with-sys-gd=$(prefix)
+CONFIGURE_ARGS += --with-sysfontmap=$(datadir)/fonts/fontmap
+#CONFIGURE_ARGS += --with-xtrafontmap=
+CONFIGURE_ARGS += --with-gsfontmap=$(datadir)/ghostscript/Resource/Init/Fontmap.GS
+CONFIGURE_ARGS += --with-gsfontdir=$(datadir)/ghostscript/fonts
 CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
 CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
@@ -82,4 +104,5 @@
 STRIP_LIBTOOL = 1
 
 include gar/category.mk
+
 PATH := /opt/csw/gnu:$(PATH)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.