From eefb14473ac6632771cddaf4a45ccb256b9db64e Mon Sep 17 00:00:00 2001
From: "Edson W. R. Pereira" <ewpereira@gmail.com>
Date: Sat, 23 Mar 2013 15:35:32 +0000
Subject: [PATCH] Adjusted the code to make it compile and run under Linux.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3074 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/Makefile.linux | 4 ++--
 lib/jt9a.F90       | 5 ++---
 mainwindow.cpp     | 2 +-
 wsjtx.pro          | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/Makefile.linux b/lib/Makefile.linux
index 27f70061c..0a1f162db 100644
--- a/lib/Makefile.linux
+++ b/lib/Makefile.linux
@@ -29,7 +29,7 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
 	fil3.o redsync.o decoder.o grid2n.o n2grid.o timer.o \
 	decode9a.o peakdt9.o getlags.o afc9.o fchisq.o \
 	twkfreq.o downsam9.o symspec2.o ipcomm.o sleep_msec.o \
-	stdmsg.o
+	stdmsg.o sec_midn.o cutil.o
 
 libjt9.a: $(OBJS1)
 	ar cr libjt9.a $(OBJS1) 
@@ -38,7 +38,7 @@ libjt9.a: $(OBJS1)
 OBJS2 = jt9.o jt9a.o
 
 jt9: 	$(OBJS2) libjt9.a
-	g++ -o jt9 $(OBJS2) -lQtCore libjt9.a -lfftw3f -lgfortran
+	g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
 	cp jt9 ../../wsjtx_install
 
 OBJS3 = jt9sim.o 
diff --git a/lib/jt9a.F90 b/lib/jt9a.F90
index 1155a8ebb..84727c216 100644
--- a/lib/jt9a.F90
+++ b/lib/jt9a.F90
@@ -3,16 +3,15 @@ subroutine jt9a
 ! NB: this interface block is required by g95, but must be omitted
 !     for gfortran.  (????)
 
-#ifndef UNIX
   interface
      function address_jt9()
+     integer*1, pointer :: address_jt9
      end function address_jt9
   end interface
-#endif
   
   integer*1 attach_jt9,lock_jt9,unlock_jt9
   integer size_jt9
-  integer*1, pointer :: address_jt9,p_jt9
+  integer*1, pointer :: p_jt9
   character*80 cwd
   logical fileExists
   common/tracer/limtrace,lu
diff --git a/mainwindow.cpp b/mainwindow.cpp
index acc1ddb4c..a51b7212c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------- MainWindow
+//---------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/wsjtx.pro b/wsjtx.pro
index 04f30155c..74d73c7d0 100644
--- a/wsjtx.pro
+++ b/wsjtx.pro
@@ -56,10 +56,9 @@ RC_FILE = wsjtx.rc
 
 unix {
 INCLUDEPATH += $$quote(/usr/include/qwt-qt4)
-LIBS += -lfftw3f /usr/lib/libgfortran.so.3
 LIBS += ../wsjtx/lib/libjt9.a
 LIBS += /usr/lib/libqwt-qt4.so
-LIBS += -lportaudio
+LIBS += -lportaudio -lgfortran -lfftw3f
 }
 
 win32 {