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

[dmichelsen at users.sourceforge.net]

Revision: 9064
          http://gar.svn.sourceforge.net/gar/?rev=9064&view=rev
Author:   dmichelsen
Date:     2010-03-09 15:39:46 +0000 (Tue, 09 Mar 2010)

Log Message:
-----------
x11vnc: Depend on csw X11

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

Modified: csw/mgar/pkg/x11vnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11vnc/trunk/Makefile	2010-03-09 15:14:20 UTC (rev 9063)
+++ csw/mgar/pkg/x11vnc/trunk/Makefile	2010-03-09 15:39:46 UTC (rev 9064)
@@ -17,25 +17,15 @@
 
 BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg
 RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg
+RUNTIME_DEP_PKGS += CSWlibx11 CSWlibxdamage CSWlibxext CSWlibxfixes CSWlibxinerama CSWlibxtst
 
-PACKAGING_PLATFORMS  = solaris8-sparc solaris8-i386
-PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+EXTRA_INC = $(prefix)/X11/include
+EXTRA_LIB = $(prefix)/X11/lib
+EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
 
-# This is to make sure the X11 path is prepended to the front of lib pathes.
-# Otherwise the wrong X11 gets picked up.
-EXTRA_LIB_garosrel-5.8  = /usr/openwin/lib
-# We can't add /usr/sfw/lib because then openssl is pickedup from there too.
-#EXTRA_LIB_garosrel-5.10 = /usr/X11/lib /usr/sfw/lib
-EXTRA_LIB_garosrel-5.10 = /usr/X11/lib
-EXTRA_LIB = $(EXTRA_LIB_garosrel-$(GAROSREL))
-
-CONFIGURE_ARGS_garosrel-5.8  = --x-includes=/usr/openwin/include
-CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib 
-CONFIGURE_ARGS_garosrel-5.10  = --x-includes=/usr/X11/include
-CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib 
-
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL))
+CONFIGURE_ARGS += --x-include=$(prefix)/X11/include
+CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
 TEST_TARGET = check
 


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