Changeset 921 for trunk/config/sys/Linux-g++.gmk

Timestamp:

Feb 16, 2009, 10:14:30 AM (15 years ago)

Author:

garnier

Message:

en test de gl2ps. Problemes de libraries

File:

• trunk/config/sys/Linux-g++.gmk (modified) (4 diffs)

trunk/config/sys/Linux-g++.gmk

@@ -46 +46 @@
   FCFLAGS += -fno-automatic -fno-backslash -fno-second-underscore
   FCLIBS := -lg2c -lnsl
-  ECHO    := /bin/echo -e
-  SHEXT   := so
+  ECHO   := /bin/echo -e
+  SHEXT  := so
+  ARCH   := $(shell uname -m | cut -s -d "_" -f 2)
+
   ifndef X11FLAGS
     X11FLAGS  := -I/usr/include/X11/extensions -I/usr/include/X11
   endif
   ifndef X11LIBS
-    X11LIBS   := -L/usr/X11R6/lib  -lXmu -lXt -lXext -lX11 -lSM -lICE
+    X11LIBS   := -L/usr/X11R6/lib$(ARCH)  -lXmu -lXt -lXext -lX11 -lSM -lICE
   endif
   ifndef XMFLAGS
@@ -59 +61 @@
   ifndef XMLIBS
     XMLIBS    := -lXm -lXpm
+  endif
+  ifndef XAWFLAGS
+    XAWFLAGS   := -I/usr/X11R6/include
+  endif
+  ifndef XAWLIBS
+    XAWLIBS    := -lXaw
+  endif
+  DLDLIBS   := -ldl
+  ifndef OGLFLAGS
+    OGLFLAGS  := -I$(OGLHOME)/include 
+  endif
+  ifndef OGLLIBS
+    OGLLIBS   := -L$(OGLHOME)/lib$(ARCH) -lGLU -lGL
   endif
 
@@ -95 +110 @@
     QTLIBS   := -L$(QTHOME)$(QTLIBPATH)
     ifeq ($(QT_VERSION),3)
-      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* | wc -l )
+      QT3_MT  := $(shell ls  $(QTHOME)$(QTLIBPATH)/libqt-mt.* 2>/dev/null | wc -l )
       ifneq ($(QT3_MT),0)
         QTLIBS  += -lqt-mt
@@ -116 +131 @@
 #----------------------------------------------------------------------------
 
-  ifndef XAWFLAGS
-    XAWFLAGS   := -I/usr/X11R6/include
-  endif
-  ifndef XAWLIBS
-    XAWLIBS    := -lXaw
-  endif
-  DLDLIBS   := -ldl
-  ifndef OGLFLAGS
-    OGLFLAGS  := -I$(OGLHOME)/include 
-  endif
-  ifndef OGLLIBS
-    OGLLIBS   := -L$(OGLHOME)/lib -lGLU -lGL
-  endif
   define build-granular-shared-lib
     @libdir=`(cd $(@D);/bin/pwd)`; \