Index: /trunk/psLib/src/Makefile.Globals
===================================================================
--- /trunk/psLib/src/Makefile.Globals	(revision 448)
+++ /trunk/psLib/src/Makefile.Globals	(revision 449)
@@ -1,5 +1,22 @@
+################################################################################
+##
+##  Makefile:  Globals
+##
+##  Assumptions:    Variable "prefix" already defined
+##
+##  $Revision: 1.2 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-04-19 19:49:40 $
+##
+##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
+##
+###############################################################################
+
+# Determine the operating system and set variable for later conditional use
+
 ifndef OSTYPE
-  OSTYPE:=$(shell uname -s)
+    OSTYPE = $(shell uname -s)
 endif
+
+# Set environment variables for the project's directory structure
 
 ifndef mandir
@@ -19,26 +36,34 @@
 endif
 
-CFLAGS:= -O2 -g2 -Wall -Werror -std=c99 -D_GNU_SOURCE -fpic --pipe
+# Set initial value for CFLAGS which will include all OS common flags for GCC
 
-LDFLAGS:= --pipe -shared -fPIC -ldl
+CFLAGS := -O2 -g2 -Wall -Werror -std=c99 -pipe
 
-SO:=so
-DLL:=so
+# Set initial value for LDFLAGS which will include all OS common flags for GCC
+
+LDFLAGS := -g2 -pipe
+
+# Define or refine variables for the Linux OS
+
+ifneq "$(findstring inux,$(OSTYPE))" ""
+    CFLAGS_RELOC := $(CFLAGS) -fpic
+    LDFLAGS_SO := $(LDFLAGS) -fpic -shared -ldl
+    LDFLAGS_DLL := $(LDFLAGS) -fpic -shared
+    DLL = so
+    SO  = so
+    DOCS = doxygen DoxyFile
+endif
 
 ifneq "$(findstring arwin,$(OSTYPE))" ""
-  CFLAGS:= -O2 -g2 -Wall -Wno-long-double -std=c99 -DDARWIN --pipe
-  LDFLAGS:= --pipe -bundle -flat_namespace -undefined suppress 
-  SO:=bundle
-  DLL:=dylib
+    CFLAGS += -Wno-long-double -DDARWIN
+    CFLAGS_RELOC := $(CFLAGS)
+    LDFLAGS_SO := $(LDFLAGS) -bundle -flat_namespace -undefined suppress
+    LDFLAGS_DLL := $(LDFLAGS) -dynamiclib
+    DLL = dylib
+    SO = bundle
+    DOCS = 
 endif
 
-ifneq "$(findstring olaris,$(OSTYPE))" ""
-  CC = gcc
-  CFLAGS_GLOBAL:= -O2 -g2 -Wall -std=c99 -DSOLARIS --pipe
-endif
-
-ifndef RANLIB
-    export RANLIB=ranlib
-endif
+# Set default for variable CC
 
 ifndef CC
@@ -46,7 +71,11 @@
 endif
 
+# Set default for variable LD
+
 ifndef LD
     export LD=ld
 endif
 
-.PHONY:	all install distclean clean print_header docs tags
+# Set list of PHONY targets
+.PHONY: all install distclean clean docs tags print_header
+