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

[hson at users.sourceforge.net]

Revision: 7839
          http://gar.svn.sourceforge.net/gar/?rev=7839&view=rev
Author:   hson
Date:     2010-01-03 07:28:19 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
libunique: Fixed Xext-problem which appeared when building on buildfarm

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

Modified: csw/mgar/pkg/libunique/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libunique/trunk/Makefile	2010-01-03 01:08:33 UTC (rev 7838)
+++ csw/mgar/pkg/libunique/trunk/Makefile	2010-01-03 07:28:19 UTC (rev 7839)
@@ -28,6 +28,7 @@
 
 REQUIRED_PKGS_CSWlibunique += CSWfconfig CSWftype2 CSWggettextrt CSWglib2
 REQUIRED_PKGS_CSWlibunique += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11 CSWpango
+REQUIRED_PKGS_CSWlibunique += CSWdbusglib CSWlibdbus CSWlibxext
 REQUIRED_PKGS_CSWlibuniquedevel += CSWlibunique
 REQUIRED_PKGS_CSWlibuniquedoc += CSWlibunique
 
@@ -38,9 +39,16 @@
 EXTRA_INC = $(prefix)/X11/include
 EXTRA_LIB = $(prefix)/X11/lib
 EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+#This is ugly, should be EXTRA_LINKER_FLAGS, but due to libtool it doesn't work
+EXTRA_LD_FLAGS_isa-i386    = -L/usr/openwin/lib -lXext
+EXTRA_LD_FLAGS_isa-sparcv8 = -L/usr/openwin/lib -lXext
+EXTRA_LD_FLAGS_isa-amd64   = -L/usr/openwin/lib/amd64 -lXext
+EXTRA_LD_FLAGS_isa-sparcv9 = -L/usr/openwin/lib/sparcv9 -lXext
+EXTRA_LD_FLAGS += $(EXTRA_LD_FLAGS_$(MODULATION))
 
 #NO_ISAEXEC = 1
 #NOISALIST = 1
+# libdbus not 64-bit yet
 #BUILD64 = 1
 
 PKGFILES_CSWlibuniquedevel = $(PKGFILES_DEVEL)


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