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

[janholzh at users.sourceforge.net]

Revision: 8093
          http://gar.svn.sourceforge.net/gar/?rev=8093&view=rev
Author:   janholzh
Date:     2010-01-19 14:55:52 +0000 (Tue, 19 Jan 2010)

Log Message:
-----------
libsoup2: merged gnome and non-gnome part

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

Modified: csw/mgar/pkg/libsoup2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsoup2/trunk/Makefile	2010-01-19 14:04:08 UTC (rev 8092)
+++ csw/mgar/pkg/libsoup2/trunk/Makefile	2010-01-19 14:55:52 UTC (rev 8093)
@@ -15,44 +15,24 @@
 
 PACKAGES  = CSWlibsoup2
 PACKAGES  += CSWlibsoup2dev
-PACKAGES  += CSWlibsoup2gnome
-PACKAGES  += CSWlibsoup2gnomedev
 SPKG_DESC_CSWlibsoup2 = HTTP client/server library for GNOME
 SPKG_DESC_CSWlibsoup2dev = HTTP client/server library for GNOME, dev files
-SPKG_DESC_CSWlibsoup2gnome = HTTP client/server library for GNOME, gnome part 
-SPKG_DESC_CSWlibsoup2gnomedev = HTTP client/server library for GNOME, gnome dev part
 
-REQUIRED_PKGS_CSWlibsoup2gnome = CSWgconf2
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWgcrypt
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWggettextrt
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWglib2
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWgnutls
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWgpgerr
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibproxy
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibxml2
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWsqlite3rt
-
-REQUIRED_PKGS_CSWlibsoup2gnome += CSWlibsoup2
-
-REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2
-REQUIRED_PKGS_CSWlibsoup2gnomedev = CSWlibsoup2gnome
-
-REQUIRED_PKGS_CSWlibsoup2 = CSWgcrypt
+REQUIRED_PKGS_CSWlibsoup2 = CSWgconf2
+REQUIRED_PKGS_CSWlibsoup2 += CSWgcrypt
 REQUIRED_PKGS_CSWlibsoup2 += CSWggettextrt
 REQUIRED_PKGS_CSWlibsoup2 += CSWglib2
 REQUIRED_PKGS_CSWlibsoup2 += CSWgnutls
 REQUIRED_PKGS_CSWlibsoup2 += CSWgpgerr
-#REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy
+REQUIRED_PKGS_CSWlibsoup2 += CSWlibproxy
 REQUIRED_PKGS_CSWlibsoup2 += CSWlibxml2
+REQUIRED_PKGS_CSWlibsoup2 += CSWsqlite3rt
 
-REQUIRED_PKGS_CSWlibsoup2dev = CSWlibsoup2
+REQUIRED_PKGS_CSWlibsoup2dev += CSWlibsoup2
 
-PKGFILES_CSWlibsoup2  = /opt/csw/lib/libsoup-2.4.so.1.2.0
-PKGFILES_CSWlibsoup2dev  = /opt/csw/lib/pkgconfig/libsoup-2.4.pc
-PKGFILES_CSWlibsoup2dev  += /opt/csw/include/libsoup-2.4/.*
-PKGFILES_CSWlibsoup2gnomedev = /opt/csw/lib/pkgconfig/libsoup-gnome-2.4.pc
-PKGFILES_CSWlibsoup2gnomedev += /opt/csw/include/libsoup-gnome-2.4/.*
 
+PKGFILES_CSWlibsoup2dev  = /opt/csw/lib/pkgconfig/.*
+PKGFILES_CSWlibsoup2dev  += /opt/csw/include/.*
 
 
 EXTRA_INC = /opt/csw/X11/include
@@ -60,9 +40,9 @@
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib 
 STRIP_LIBTOOL = 1
 
-CONFIGURE_ARGS = $(DIRPATHS) --disable-static --with-apache-httpd=/opt/csw/apache2/sbin/httpd --with-apache-module-dir=/opt/csw/apache2/libexec/
+CONFIGURE_ARGS = $(DIRPATHS) --disable-static 
 
-#TEST_TARGET = check
-TEST_TARGET =
+# Test disabled because of missing Apache stuff
+TEST_TARGET = 
 
 include gar/category.mk


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