fix: makefile and fortran code except staden bap

src/Misc/makefile-alpha

@@ -16,7 +16,7 @@ INCLUDES = -I$(SRC)
 # Alpha Version
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact $(INCLUDES)
+CFLAGS = -g  $(INCLUDES)
 ARFLAGS = rv
 
 #

src/abi/makefile-alpha

@@ -16,9 +16,9 @@ SRC = .
 # Alpha
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact -I$(SRC)/../ted
+CFLAGS = -g -I$(SRC)/../ted
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g
 
 #
 # Make the programs

src/alf/makefile-alpha

@@ -16,9 +16,9 @@ SRC = .
 # Alpha
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact -I$(SRC)/../ted
+CFLAGS = -g  -I$(SRC)/../ted
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g 
 
 
 #

src/bap/makefile-alpha

@@ -26,13 +26,13 @@ PROGS= $(NPROGS) $(LPROGS) $(XPROGS)
 #
 SRC = .
 STADENSRC=$(SRC)/../staden
-STADENBIN=$(STADENSRC)/alpha-binaries
+STADENBIN=$(STADENSRC)
 TEDSRC=$(SRC)/../ted
-TEDBIN=$(STADENBIN)
+TEDBIN=$(TEDSRC)
 OSPSRC=$(SRC)/osp-bits
-OSPBIN=$(OSPSRC)/alpha-binaries
+OSPBIN=$(OSPSRC)
 MISCSRC=$(SRC)/../Misc
-MISCBIN=$(MISCSRC)/alpha-binaries
+MISCBIN=$(MISCSRC)
 # Use the ted sources compiled for staden executables
 INCLUDES= -I$(SRC) -I$(STADENSRC) -I$(TEDSRC) -I$(OSPSRC) -I$(MISCSRC)
 
@@ -41,18 +41,19 @@ INCLUDES= -I$(SRC) -I$(STADENSRC) -I$(TEDSRC) -I$(OSPSRC) -I$(MISCSRC)
 # Compilers and flags
 #
 CC= cc
-CFLAGS= -g -std1 -ieee_with_inexact $(INCLUDES)
-F77= f77
+CFLAGS= -g $(INCLUDES)
+F77= gfortran
 FFLAGS= -g -C
 
-FLIBS= -lfor -lutil -lUfor -lots -lFutil -lm -lfor -lutil -lUfor -lots -lFutil -ldnet_stub
+#FLIBS= -lfor -lUfor  -lots -lFutil
+FLIBS = -lm -lutil  
 XLIBS= -lXaw -lXt -lXmu -lXext -lX11
 LFLAGS= $(FLIBS)
 XLFLAGS= $(XLIBS) $(FLIBS)
 
-LD = f77
+LD = gfortran
 XLD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g
 
 #
 # Avoid compilation of objects in remote directories
@@ -540,28 +541,30 @@ splitp3: $(SPLITP3OBJS)
 # avoid filling up the (small on this machine) /tmp directory
 # with compiler debugging information.
 #
+#%.a: $(SRC)/%.f
+#	BINDIR=`pwd`; \
+#	cd $(SRC); \
+#	SRCDIR=`pwd`; \
+#	TMPDIR=/tmp/staden$$$$; \
+#	if test ! -d $$TMPDIR; \
+#	then mkdir $$TMPDIR; \
+#	fi; \
+#	cd $$TMPDIR; \
+#	rm -f *.f *.o; \
+#	fsplit $$SRCDIR/`expr $< : '.*/\(.*\)' \| $<`; \
+#	$(F77) $(FFLAGS) -c *.f; \
+#	rm *.f; \
+#	rm -f $$BINDIR/$@; \
+#	ar rcv $$BINDIR/$@ *.o; \
+#	ranlib $$BINDIR/$@; \
+#	rm *.o; \
+#	cd $$BINDIR; \
+#	rm -r $$TMPDIR
+
+
 %.a: $(SRC)/%.f
-	BINDIR=`pwd`; \
-	cd $(SRC); \
-	SRCDIR=`pwd`; \
-	TMPDIR=/tmp/staden$$$$; \
-	if test ! -d $$TMPDIR; \
-	then mkdir $$TMPDIR; \
-	fi; \
-	cd $$TMPDIR; \
-	rm -f *.f *.o; \
-	fsplit $$SRCDIR/`expr $< : '.*/\(.*\)' \| $<`; \
-	$(F77) $(FFLAGS) -c *.f; \
-	rm *.f; \
-	rm -f $$BINDIR/$@; \
-	ar rcv $$BINDIR/$@ *.o; \
-	ranlib $$BINDIR/$@; \
-	rm *.o; \
-	cd $$BINDIR; \
-	rm -r $$TMPDIR
-
-
-
+	$(F77) $(FFLAGS) -c *.f; 
+	ar rcv $$BINDIR/$@ *.o; 
 
 
 

src/bap/osp-bits/makefile-alpha

@@ -23,7 +23,7 @@ VERSION = SUBVERSION
 # Compiler - debug on
 #
 CC= cc
-CFLAGS= -g -non_shared -std1 -ieee_with_inexact -D$(VERSION)
+CFLAGS= -g -D$(VERSION)
 
 
 #

src/convert/makefile-alpha

@@ -4,12 +4,12 @@
 
 SRC = .
 MISCSRC=$(SRC)/../Misc
-MISCBIN=$(MISCSRC)/alpha-binaries
+MISCBIN=$(MISCSRC)
 
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact -I$(MISCSRC)
+CFLAGS = -g -I$(MISCSRC)
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g
 LIBS = $(MISCBIN)/misc.a
 
 #

src/cop/makefile-alpha

@@ -13,7 +13,7 @@ PROGS = cop cop-bap
 SRC = .
 TEDSRC = $(SRC)/../ted
 MISCSRC = $(SRC)/../Misc
-MISCBIN = $(MISCSRC)/alpha-binaries
+MISCBIN = $(MISCSRC)
 CONVERTSRC = $(SRC)/../convert
 INCLUDES = -I$(SRC) -I$(TEDSRC) -I$(MISCSRC) -I$(CONVERTSRC)
 
@@ -21,9 +21,9 @@ INCLUDES = -I$(SRC) -I$(TEDSRC) -I$(MISCSRC) -I$(CONVERTSRC)
 # Alpha
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact $(INCLUDES)
+CFLAGS = -g $(INCLUDES)
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g 
 LIBFLAGS = 
 
 #

src/expGetSeq/makefile-alpha

@@ -42,9 +42,9 @@ INCLUDES = -I/usr/include/mit -I$(SRC) -I$(TEDSRC)
 # Compiler - debug on
 #
 CC= cc
-CFLAGS= -g -ieee_with_inexact $(SWITCHES) $(INCLUDES)
+CFLAGS= -g  $(SWITCHES) $(INCLUDES)
 LD= cc
-LDFLAGS= -g -non_shared
+LDFLAGS= -g
 
 
 #

src/frog/makefile-alpha

@@ -1,7 +1,7 @@
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact
+CFLAGS = -g 
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g
 LIBFLAGS =
 
 SRC = .

src/getMCH/makefile-alpha

@@ -35,9 +35,9 @@ INCLUDES = -I$(SRC) -I$(TEDSRC)
 # Compiler - debug on
 #
 CC= cc
-CFLAGS= -g -std1 -ieee_with_inexact $(SWITCHES) $(INCLUDES)
+CFLAGS= -g $(SWITCHES) $(INCLUDES)
 LD= cc
-LDFLAGS= -g -non_shared
+LDFLAGS= -g
 LIBFLAGS =
 
 

src/indexseqlibs/makefile-alpha

@@ -44,9 +44,9 @@ SRC = .
 # Alpha
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact
+CFLAGS = -g
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g
 
 #
 # Shared objects

src/newted/Graph.c

@@ -1,4 +1,3 @@
-#include <X11/copyright.h>
 
 /* $XConsortium: Graph.c,v 1.2 88/10/25 17:40:25 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */

src/newted/Graph.h

@@ -1,4 +1,3 @@
-#include <X11/copyright.h>
 
 /* $XConsortium: Graph.h,v 1.2 88/10/25 17:22:09 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */

src/newted/GraphP.h

@@ -1,4 +1,3 @@
-#include <X11/copyright.h>
 
 /* $XConsortium: GraphP.h,v 1.2 88/10/25 17:37:59 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */

src/newted/makefile-alpha

@@ -42,11 +42,11 @@ SRC = .
 #
 CC= cc
 INCLUDES = -I$(SRC)
-CFLAGS= -g -std1 -ieee_with_inexact $(SWITCHES) $(INCLUDES)
-LIBS= -lXaw -lXt -lXmu -lXext -lX11 -ldnet_stub
+CFLAGS= -g  $(SWITCHES) $(INCLUDES)
+LIBS= -lXaw -lXt -lXmu -lXext -lX11 
 #
 LD= cc
-LDFLAGS= -g -non_shared
+LDFLAGS= -g 
 
 #
 # Object files

src/scf/makefile-alpha

@@ -22,9 +22,9 @@ TEDSRC = $(SRC)/../ted
 # alpha
 #
 CC= cc
-CFLAGS= -g -std1 -ieee_with_inexact $(SWITCHES) -I$(TEDSRC)
+CFLAGS= -g  $(SWITCHES) -I$(TEDSRC)
 LD= cc
-LDFLAGS= -g -non_shared
+LDFLAGS= -g
 LIBFLAGS =
 
 %.o : $(SRC)/%.c

src/staden/makefile-alpha

@@ -19,25 +19,25 @@ PROGS= $(NPROGS) $(LPROGS) $(XPROGS)
 SRC=.
 TEDSRC=$(SRC)/../ted
 MISCSRC=$(SRC)/../Misc
-MISCBIN=$(MISCSRC)/alpha-binaries
+MISCBIN=$(MISCSRC)
 INCLUDES= -I$(SRC) -I$(TEDSRC) -I$(MISCSRC)
 
 #
 # Compilers and flags
 #
 CC= cc
-CFLAGS= -g -std1 -ieee_with_inexact $(INCLUDES)
-F77= f77
-FFLAGS= -g -C
+CFLAGS= -g $(INCLUDES)
+F77= gfortran
+FFLAGS= -g -fdec -C
 
 FLIBS= -lfor -lutil -lUfor -lots -lFutil -lm -lfor -lutil -lUfor -lots -lFutil
 XLIBS= -lXaw -lXt -lXmu -lXext -lX11 -ldnet_stub
 LFLAGS= $(FLIBS)
 XLFLAGS= $(FLIBS) $(XLIBS) 
 
-LD = f77
+LD = gfortran
 CLD = cc
-LDFLAGS = -g -non_shared # Comment out for faster linking when debugging
+LDFLAGS = -g # Comment out for faster linking when debugging
 
 
 
@@ -549,25 +549,29 @@ vep: $(VEPOBJS)
 # avoid filling up the (small on this machine) /tmp directory
 # with compiler debugging information.
 #
+#%.a:	$(SRC)/%.f
+#	BINDIR=`pwd`; \
+#	cd $(SRC); \
+#	SRCDIR=`pwd`; \
+#	TMPDIR=/tmp/staden$$$$; \
+#	if test ! -d $$TMPDIR; \
+#	then mkdir $$TMPDIR; \
+#	fi; \
+#	cd $$TMPDIR; \
+#	rm -f *.f *.o; \
+#	fsplit $$SRCDIR/`expr $< : '.*/\(.*\)' \| $<`; \
+#	$(F77) $(FFLAGS) -c *.f; \
+#	rm *.f; \
+#	rm -f $$BINDIR/$@; \
+#	ar rcv $$BINDIR/$@ *.o; \
+#	ranlib $$BINDIR/$@; \
+#	rm *.o; \
+#	cd $$BINDIR; \
+#	rm -r $$TMPDIR
+
 %.a:	$(SRC)/%.f
-	BINDIR=`pwd`; \
-	cd $(SRC); \
-	SRCDIR=`pwd`; \
-	TMPDIR=/tmp/staden$$$$; \
-	if test ! -d $$TMPDIR; \
-	then mkdir $$TMPDIR; \
-	fi; \
-	cd $$TMPDIR; \
-	rm -f *.f *.o; \
-	fsplit $$SRCDIR/`expr $< : '.*/\(.*\)' \| $<`; \
 	$(F77) $(FFLAGS) -c *.f; \
-	rm *.f; \
-	rm -f $$BINDIR/$@; \
-	ar rcv $$BINDIR/$@ *.o; \
-	ranlib $$BINDIR/$@; \
-	rm *.o; \
-	cd $$BINDIR; \
-	rm -r $$TMPDIR
+	ar rcv *.o
 
 #.f.a:
 #	$(F77) $(FFLAGS) -c $<

src/ted/Graph.c

@@ -1,4 +1,3 @@
-#include <X11/copyright.h>
 
 /* $XConsortium: Graph.c,v 1.2 88/10/25 17:40:25 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */

src/ted/Graph.h

@@ -1,5 +1,3 @@
-#include <X11/copyright.h>
-
 /* $XConsortium: Graph.h,v 1.2 88/10/25 17:22:09 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */
 
@@ -55,18 +53,15 @@
 #define XtNgraphColour4 "graphColour4"
 #define XtNresizeCallback "resizeCallback"
 
-
 /* declare specific GraphWidget class and instance datatypes */
 
 typedef struct _GraphClassRec *GraphWidgetClass;
 typedef struct _GraphRec *GraphWidget;
 
-
 /* declare the class constant */
 
 extern WidgetClass graphWidgetClass;
 
-
 /* ---- Exported procedures ---- */
 
 extern Pixel GraphColour1(Widget w);

src/ted/GraphP.h

@@ -1,4 +1,3 @@
-#include <X11/copyright.h>
 
 /* $XConsortium: GraphP.h,v 1.2 88/10/25 17:37:59 swick Exp $ */
 /* Copyright	Massachusetts Institute of Technology	1987, 1988 */

src/ted/makefile-alpha

@@ -33,13 +33,14 @@ SRC = .
 #
 # Compiler - debug on
 #
-CC= cc
+CC= gfortran
 INCLUDES = -I$(SRC)
-CFLAGS= -g -std1 -ieee_with_inexact $(SWITCHES) $(INCLUDES)
-LIBS= -lXaw -lXt -lXmu -lXext -lX11 -ldnet_stub
+CFLAGS= -g $(SWITCHES) $(INCLUDES)
+LIBS= -lXaw -lXt -lXmu -lXext -lX11 
+#-ldnet_stub
 #
-LD= cc
-LDFLAGS= -g -non_shared
+LD= gfortran
+LDFLAGS= -g 
 
 #
 # Object files

src/update_subclones/makefile-alpha

@@ -12,16 +12,16 @@ PROGS = update_subclones
 #
 SRC = .
 MISCSRC = $(SRC)/../Misc
-MISCBIN = $(MISCSRC)/alpha-binaries
+MISCBIN = $(MISCSRC)
 INCLUDES = -I$(SRC) -I$(MISCSRC)
 
 #
 # Alpha
 #
 CC = cc
-CFLAGS = -g -std1 -ieee_with_inexact $(INCLUDES)
+CFLAGS = -g $(INCLUDES)
 LD = cc
-LDFLAGS = -g -non_shared
+LDFLAGS = -g 
 
 #
 # Here they are

src/vepe/makefile-alpha

@@ -21,7 +21,7 @@ all: $(PROGS)
 SRC = .
 #STADENSRC=/nfs/rutland/home3/pubseq/inhouse/share/src/staden
 STADENSRC=$(SRC)/../staden
-STADENBIN=$(STADENSRC)/alpha-binaries
+STADENBIN=$(STADENSRC)
 # Use the ted sources compiled for staden executables
 INCLUDES= -I$(STADENSRC)
 
@@ -31,11 +31,11 @@ INCLUDES= -I$(STADENSRC)
 #
 # debug on
 CC= cc
-CFLAGS= -g -std1 -ieee_with_inexact $(INCLUDES)
-F77= f77
+CFLAGS= -g $(INCLUDES)
+F77= gfortran
 FFLAGS= -g
-LD= f77
-LDFLAGS= -g -non_shared
+LD= gfortran
+LDFLAGS= -g 
 
 FLIBS= -lfor -lutil -lUfor -lots -lFutil -lm -lfor -lutil -lUfor -lots -lFutil
 XLIBS= -lXaw -lXt -lXmu -lXext -lX11