Changeset 1043 for branches/rel1/psLib/src/Makefile.Globals

Timestamp:

Jun 14, 2004, 5:09:26 PM (22 years ago)

Author:

desonia

Message:

folded in last-minute bug fixes from the main trunk.

File:

• branches/rel1/psLib/src/Makefile.Globals (modified) (4 diffs)

branches/rel1/psLib/src/Makefile.Globals

@@ -5 +5 @@
 ##  Assumptions:    Variable "prefix" already defined
 ##
-##  $Revision: 1.10 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-12 01:33:16 $
+##  $Revision: 1.10.2.1 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-15 03:09:15 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -46 +46 @@
 # Set initial value for LDFLAGS which will include all OS common flags for GCC and required libraries.
 
-LDFLAGS := -g2 -pipe -lcfitsio -lgsl -lgslcblas -lfftw3f
+EXTLIBS := -lcfitsio -lgsl -lgslcblas -lfftw3f
+LDFLAGS := -g2 -pipe $(EXTLIBS) 
 
 # Define or refine variables for the Linux OS
@@ -64 +65 @@
     CFLAGS += -Wno-long-double -DDARWIN
     CFLAGS_RELOC := $(CFLAGS)
+    LDFLAGS := $(LDFLAGS) -lmx
     LDFLAGS_SO := $(LDFLAGS) -bundle -flat_namespace -undefined suppress
     LDFLAGS_DLL := $(LDFLAGS) -dynamiclib
@@ -70 +72 @@
     DOCS =
     BUILD_DYNAMIC1 = libtool -dynamic
-    BUILD_DYNAMIC2 = -lm -lgcc -o
+    BUILD_DYNAMIC2 = -lm -lmx -lgcc $(EXTLIBS) -o
 endif