modified: EXE/Makefile

modified: etc/Makefile.NEW modified: etc/Makefile.variables

modified: EXE/Makefile
modified: etc/Makefile.NEW modified: etc/Makefile.variables
19757825 · Whitney Armstrong · c2b68c6e · 19757825 · 19757825 · 19757825
Commit 19757825 authored 7 years ago by Whitney Armstrong
--- a/EXE/Makefile
+++ b/EXE/Makefile
@@ -10,16 +10,16 @@ disp_objs = glvolu.o

 Csoft=$(PWD)

-ifeq ($(MYOS),HPUX)
-  ifneq (,$(findstring 09,$(shell uname -r)))
-    HPUXVERSION := 09
-  else
-    HPUXVERSION := 10
-  endif
-  LIBROOT = $(Csoft)/../$(MYOS)$(HPUXVERSION)/lib
-else
-  LIBROOT = $(Csoft)/../$(MYOS)/lib
-endif
+#ifeq ($(MYOS),HPUX)
+#  ifneq (,$(findstring 09,$(shell uname -r)))
+#    HPUXVERSION := 09
+#  else
+#    HPUXVERSION := 10
+#  endif
+#  LIBROOT = $(Csoft)/../$(MYOS)$(HPUXVERSION)/lib
+#else
+LIBROOT = $(Csoft)/../$(MYOS)/lib
+#endif

 ONEEVLIB = $(LIBROOT)/liboneev.a
 ENGINELIB = $(LIBROOT)/libengine.a
@@ -48,34 +48,34 @@ OURGENLIBS = $(ENGINELIB) $(HTRACKINGLIB) $(STRACKINGLIB) $(TRACKINGLIB) \
 	$(BTRACKINGLIB) $(SANETRACKINGLIB) $(F1TRIGGER) $(SEM)
 MAKEREG=$(Csoft)/../$(MYOS)/bin/makereg

-ifeq ($(MYOS),HPUX)
-  FFLAGS=+U77 +ppu -C +es -O +Onolimit +FPVZOU -I$(Csoft)/INCLUDE
-  DISPFLAGS=+U77 +ppu +es -O +Onolimit +FPVZOU -I$(Csoft)/INCLUDE
-  LDFLAGS=-Wl,-a archive
-  OTHERLIBS += \
-	-Wl,-L$(CODA)/HP_UX/lib \
-	-Wl,-L$(CERN_ROOT)/lib -lpacklib $(CERNLIBS) \
-	-Wl,-L/usr/lib/X11R5 -lX11 -lm 
-  MAKEREG=$(Csoft)/../$(MYOS)$(HPUXVERSION)/bin/makereg
-  OURLIBS := $(OURGENLIBS)
-endif
-
-ifeq ($(MYOS),ULTRIX)
-  FFLAGS=-check_bounds
-  DISPFLAGS=$(FFLAGS)
-  LDFLAGS=
-  OTHERLIBS += -L$(CODA)/ULTRIX/lib \
-	-lana -lmsg -lcoda -L$(CERN_ROOT)/lib -lpacklib
-  OURLIBS := $(OURGENLIBS)
-endif
-
-ifeq ($(MYOS),OSF1)
-  FFLAGS=-non_shared -check_bounds -align dcommons
-  DISPFLAGS=$(FFLAGS)
-  LDFLAGS=
-  OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib
-  OURLIBS := $(OURGENLIBS)
-endif
+#ifeq ($(MYOS),HPUX)
+#  FFLAGS=+U77 +ppu -C +es -O +Onolimit +FPVZOU -I$(Csoft)/INCLUDE
+#  DISPFLAGS=+U77 +ppu +es -O +Onolimit +FPVZOU -I$(Csoft)/INCLUDE
+#  LDFLAGS=-Wl,-a archive
+#  OTHERLIBS += \
+#	-Wl,-L$(CODA)/HP_UX/lib \
+#	-Wl,-L$(CERN_ROOT)/lib -lpacklib $(CERNLIBS) \
+#	-Wl,-L/usr/lib/X11R5 -lX11 -lm 
+#  MAKEREG=$(Csoft)/../$(MYOS)$(HPUXVERSION)/bin/makereg
+#  OURLIBS := $(OURGENLIBS)
+#endif
+#
+#ifeq ($(MYOS),ULTRIX)
+#  FFLAGS=-check_bounds
+#  DISPFLAGS=$(FFLAGS)
+#  LDFLAGS=
+#  OTHERLIBS += -L$(CODA)/ULTRIX/lib \
+#	-lana -lmsg -lcoda -L$(CERN_ROOT)/lib -lpacklib
+#  OURLIBS := $(OURGENLIBS)
+#endif
+#
+#ifeq ($(MYOS),OSF1)
+#  FFLAGS=-non_shared -check_bounds -align dcommons
+#  DISPFLAGS=$(FFLAGS)
+#  LDFLAGS=
+#  OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib
+#  OURLIBS := $(OURGENLIBS)
+#endif

 ifeq ($(MYOS),Linux)  
   override FFLAGS += -I$(Csoft)/INCLUDE
@@ -84,32 +84,32 @@ ifeq ($(MYOS),Linux)
      OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm
   else
      #OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm -lnsl
-      OTHERLIBS += $(CERN_ROOT)/lib/libpacklib.a $(CERN_ROOT)/lib/libkernlib.a -lnsl -lcrypt -ldl
+      OTHERLIBS += $(CERN_ROOT)/lib/libpacklib.a $(CERN_ROOT)/lib/libkernlib.a -lnsl -lcrypt -ldl -lgfortran
   endif 
   OURLIBS := $(OURGENLIBS) $(LIBROOT)/libport.a
 endif

-ifeq ($(MYOS),SunOS)
-  FFLAGS=-e -O -I$(Csoft)/INCLUDE
-  DISPFLAGS=$(FFLAGS)
-  ifeq ($(MYOS),SunOS4)
-    OTHERLIBS += -L$(CERN_ROOT)/lib $(CERNLIBS) -lnsl -lX11
-  else
-    OTHERLIBS += -L$(CERN_ROOT)/lib $(CERNLIBS) -lnsl -lsocket -lX11
-  endif
-  OURLIBS := $(OURGENLIBS)
-  ifndef CERN_ROOT
-    CERN_ROOT=/apps/cernlib/sun4_solaris2/97a
-  endif
-endif
- 
-ifeq ($(MYOS),AIX)
-  FC=f77
-  FFLAGS=-g -qfixed=132 -qextname -O -I$(Csoft)/INCLUDE
-  DISPFLAGS=$(FFLAGS)
-  OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib $(CERNLIBS) -lX11
-  OURLIBS := $(OURGENLIBS) $(LIBROOT)/libport.a
-endif
+#ifeq ($(MYOS),SunOS)
+#  FFLAGS=-e -O -I$(Csoft)/INCLUDE
+#  DISPFLAGS=$(FFLAGS)
+#  ifeq ($(MYOS),SunOS4)
+#    OTHERLIBS += -L$(CERN_ROOT)/lib $(CERNLIBS) -lnsl -lX11
+#  else
+#    OTHERLIBS += -L$(CERN_ROOT)/lib $(CERNLIBS) -lnsl -lsocket -lX11
+#  endif
+#  OURLIBS := $(OURGENLIBS)
+#  ifndef CERN_ROOT
+#    CERN_ROOT=/apps/cernlib/sun4_solaris2/97a
+#  endif
+#endif
+# 
+#ifeq ($(MYOS),AIX)
+#  FC=f77
+#  FFLAGS=-g -qfixed=132 -qextname -O -I$(Csoft)/INCLUDE
+#  DISPFLAGS=$(FFLAGS)
+#  OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib $(CERNLIBS) -lX11
+#  OURLIBS := $(OURGENLIBS) $(LIBROOT)/libport.a
+#endif

 # There are no r_%.f files used or built -- this rule isn't used
 r_%.f : %.cmn $(MAKEREG)

--- a/etc/Makefile.NEW
+++ b/etc/Makefile.NEW
@@ -4,60 +4,60 @@ include ../etc/Makefile.variables

 MAKEFILENAME = Makefile.Unix

-ifeq ($(MYOS),HPUX)
-
-  ifneq (,$(findstring 09,$(shell uname -r)))
-    HPUXVERSION := 09
-  else
-    HPUXVERSION := 10
-  endif
-  SUBDIRNAME = O.hpux$(HPUXVERSION)
-  OSEXT = $(HPUXVERSION)
-endif
-
-ifeq ($(MYOS),HPUXTEST)
-  MYOS = HPUX
-  SUBDIRNAME = O.hpuxtest
-  OSEXT = TEST
-endif
-
-ifeq ($(MYOS),ULTRIX)
-  SUBDIRNAME = O.ultrix
-  OSEXT =
-endif
-
-#Alpha port known to work on a
-#	DEC Alphastation 200 4/166 with DEC Unix V4.0B (Rev 564)
-ifeq ($(MYOS),OSF1)
-  SUBDIRNAME = O.OSF1
-  OSEXT =
-endif
+#ifeq ($(MYOS),HPUX)
+#
+#  ifneq (,$(findstring 09,$(shell uname -r)))
+#    HPUXVERSION := 09
+#  else
+#    HPUXVERSION := 10
+#  endif
+#  SUBDIRNAME = O.hpux$(HPUXVERSION)
+#  OSEXT = $(HPUXVERSION)
+#endif
+#
+#ifeq ($(MYOS),HPUXTEST)
+#  MYOS = HPUX
+#  SUBDIRNAME = O.hpuxtest
+#  OSEXT = TEST
+#endif
+#
+#ifeq ($(MYOS),ULTRIX)
+#  SUBDIRNAME = O.ultrix
+#  OSEXT =
+#endif
+#
+##Alpha port known to work on a
+##	DEC Alphastation 200 4/166 with DEC Unix V4.0B (Rev 564)
+#ifeq ($(MYOS),OSF1)
+#  SUBDIRNAME = O.OSF1
+#  OSEXT =
+#endif

 ifeq ($(MYOS),Linux)
  SUBDIRNAME = O.Linux
  OSEXT =
 endif

-ifeq ($(MYOS),LinuxTEST)
-  MYOS = Linux
-  SUBDIRNAME = O.LinuxTEST
-  OSEXT = TEST
-endif
-
-ifeq ($(MYOS),SunOS)
-  ifeq ($(MYOS),SunOS4)
-    OSVERSION=4
-  else
-    OSVERSION=5
-  endif
-  SUBDIRNAME = O.$(MYOS)
-  OSEXT =
-endif
-
-ifeq ($(MYOS),AIX)
-  SUBDIRNAME = O.aix
-  OSEXT = 
-endif
+#ifeq ($(MYOS),LinuxTEST)
+#  MYOS = Linux
+#  SUBDIRNAME = O.LinuxTEST
+#  OSEXT = TEST
+#endif
+#
+#ifeq ($(MYOS),SunOS)
+#  ifeq ($(MYOS),SunOS4)
+#    OSVERSION=4
+#  else
+#    OSVERSION=5
+#  endif
+#  SUBDIRNAME = O.$(MYOS)
+#  OSEXT =
+#endif
+#
+#ifeq ($(MYOS),AIX)
+#  SUBDIRNAME = O.aix
+#  OSEXT = 
+#endif

 # OSEXT is either TEST or empty
 # If you want to use LinuxTEST as shown above, just pass OSEXT=TEST

--- a/etc/Makefile.variables
+++ b/etc/Makefile.variables
@@ -23,36 +23,36 @@ FFLAGS = -O -ffixed-line-length-132  -Wall -W   #-pg #-pedantic
 CC = gcc
 CXX = g++

+FC = gfortran
+FFLAGS += $(g77flags)

-ifeq ($(gccversion),4)
-  ifeq ($(gccversion),4)
-#  ifeq ($(shell gfortran $(getversion)),4)
-    FC = gfortran
-    # cfortran.h wants gFortran to be defined
-    # We have two versions of cfortran.h: one from NetCDF and one from Debian
-    # Both versions support GCC 4, whereas the official version does not
-    # We use NetCDF's cfortran.h at the moment
-    # The other version is in CTP/cfortran.h.debian
-    CFLAGS += -DgFortran
-    CXXFLAGS += -DgFortran
-  else
-    # this happens if you're using a JLab RHEL3 system and have typed "use gcc/4.1.1"
-    # JLab RHEL3 systems currently have GCC 4 but no gfortran.
-    define message
-
-  +--------------------------------------------------------------------------+
-  | Warning: Using GNU C compiler version 4 but gfortran not found. Falling  |
-  | back to g77 + GCC 3 for Fortran but still using GCC 4 for C and C++.     |
-  +--------------------------------------------------------------------------+
-    endef
-    $(warning $(message))
-    FC = g77
-    FFLAGS += $(g77flags) -static
-  endif
-else
-  FC = gfortran
-  FFLAGS += $(g77flags)
-endif
+#ifeq ($(gccversion),4)
+#  ifeq ($(gccversion),4)
+##  ifeq ($(shell gfortran $(getversion)),4)
+#    FC = gfortran
+#    # cfortran.h wants gFortran to be defined
+#    # We have two versions of cfortran.h: one from NetCDF and one from Debian
+#    # Both versions support GCC 4, whereas the official version does not
+#    # We use NetCDF's cfortran.h at the moment
+#    # The other version is in CTP/cfortran.h.debian
+#    CFLAGS += -DgFortran
+#    CXXFLAGS += -DgFortran
+#  else
+#    # this happens if you're using a JLab RHEL3 system and have typed "use gcc/4.1.1"
+#    # JLab RHEL3 systems currently have GCC 4 but no gfortran.
+#    define message
+#
+#  +--------------------------------------------------------------------------+
+#  | Warning: Using GNU C compiler version 4 but gfortran not found. Falling  |
+#  | back to g77 + GCC 3 for Fortran but still using GCC 4 for C and C++.     |
+#  +--------------------------------------------------------------------------+
+#    endef
+#    $(warning $(message))
+#    FC = g77
+#    FFLAGS += $(g77flags) -static
+#  endif
+#else
+#endif

 SHELL = /bin/sh
 CP = cp -f