From 34a7d4befa190cf6921eb0f041271209bb04d0a4 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Thu, 25 Jul 2013 18:12:03 +0000
Subject: [PATCH] Makefiles should create EXE_DIR if it does not exist.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3503 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/Makefile.MinGW | 21 +++++++++++++--------
 lib/Makefile.linux | 22 +++++++++-------------
 lib/jt9.f90        |  1 -
 mainwindow.cpp     |  2 +-
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lib/Makefile.MinGW b/lib/Makefile.MinGW
index e09924b6f..cca980fe4 100644
--- a/lib/Makefile.MinGW
+++ b/lib/Makefile.MinGW
@@ -2,7 +2,16 @@
 # Windows re-direct:
 #   C> make > junk1 2>&1
 
+# Set paths
+EXE_DIR = ../../wsjtx_install
+INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
+	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
+	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
+	 -I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
+
+# Compilers
 CC = gcc
+CXX = g++
 FC = g95
 
 FFLAGS = -O2 -fbounds-check -Wall -Wno-precision-loss -fno-second-underscore
@@ -47,9 +56,10 @@ libjt9.a: $(OBJS1)
 OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o ipcomm.o sec_midn.o cutil.o
 LIBS2 = -L'c:/QtSDK/Desktop/Qt/4.7.4/mingw/lib' -lQtCore4
 jt9.exe: $(OBJS2) libjt9.a
-	g++ -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
+	$(CXX) -o jt9.exe $(OBJS2) $(LIBS2) libjt9.a ../libfftw3f_win.a \
 	c:/MinGW/lib/libf95.a
-	cp jt9.exe ../../wsjtx_install
+	mkdir -p $(EXE_DIR)
+	cp jt9.exe $(EXE_DIR)
 
 OBJS3 = jt9sim.o 
 jt9sim.exe: $(OBJS3) libjt9.a
@@ -63,11 +73,6 @@ OBJS5 = jt65.o
 jt65.exe: $(OBJS5) libjt9.a 
 	$(FC) -o jt65.exe $(OBJS5) libjt9.a ../libfftw3f_win.a
 
-INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
-	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
-	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
-	 -I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
-
 sync9.o: sync9.f90 jt9sync.f90
 	$(FC) $(FFLAGS) -c sync9.f90
 
@@ -90,7 +95,7 @@ unpackmsg.o: unpackmsg.f90
 	$(FC) -c -O0 -fbounds-check -Wall -Wno-precision-loss unpackmsg.f90
 
 ipcomm.o: ipcomm.cpp
-	g++ -c $(INCPATH) ipcomm.cpp
+	$(CXX) -c $(INCPATH) ipcomm.cpp
 
 sec_midn.o: sec_midn.f90
 	$(FC) -c -fno-second-underscore sec_midn.f90
diff --git a/lib/Makefile.linux b/lib/Makefile.linux
index 19e6096e7..38c3ac753 100644
--- a/lib/Makefile.linux
+++ b/lib/Makefile.linux
@@ -1,4 +1,9 @@
+# Set paths
+EXE_DIR = ../../wsjtx_install
+INCPATH =  -I'/usr/include/qt4' -I'/usr/include/qt4/QtCore' 
+
 CC = gcc
+CXX = g++
 FC = gfortran
 
 FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore
@@ -44,8 +49,9 @@ libjt9.a: $(OBJS1)
 OBJS2 = jt9.o jt9a.o jt9b.o jt9c.o
 
 jt9: 	$(OBJS2) libjt9.a 
-	g++ -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
-	cp jt9 ../../wsjtx_install
+	$(CXX) -o jt9 $(OBJS2) libjt9.a -lfftw3f -lgfortran -lQtCore
+	mkdir -p $(EXE_DIR)
+	cp jt9 $(EXE_DIR)
 
 OBJS3 = jt9sim.o 
 jt9sim: $(OBJS3) libjt9.a
@@ -55,16 +61,6 @@ OBJS4 = jt9code.o
 jt9code: $(OBJS4) libjt9.a
 	$(FC) -o jt9code $(OBJS4) libjt9.a
 
-#INCPATH = -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/QtCore' \
-#	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include' \
-#	 -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/include/ActiveQt' \
-#	 -I'release' -I'.' -I'c:/QtSDK/Desktop/Qt/4.7.4/mingw/mkspecs/win32-g++'
-
-INCPATH =  -I'/usr/include/qt4' -I'/usr/include/qt4/QtCore' 
-
-#jt9.o:	jt9.f90
-#	$(FC) -O0 -c jt9.f90
-
 sync9.o: sync9.f90 jt9sync.f90
 	$(FC) $(FFLAGS) -c sync9.f90
 
@@ -84,7 +80,7 @@ redsync.o: redsync.f90 jt9sync.f90
 	$(FC) $(FFLAGS) -c redsync.f90
 
 ipcomm.o: ipcomm.cpp
-	g++ -c $(INCPATH) ipcomm.cpp
+	$(CXX) -c $(INCPATH) ipcomm.cpp
 
 sec_midn.o: sec_midn.f90
 	$(FC) -c -fno-second-underscore sec_midn.f90
diff --git a/lib/jt9.f90 b/lib/jt9.f90
index 1f0a619d6..1a7675d2a 100644
--- a/lib/jt9.f90
+++ b/lib/jt9.f90
@@ -25,7 +25,6 @@ program jt9
   if(arg(1:2).eq.'-s') then
 ! Multiple instances:
      call getarg(2,arg)
-     i0=len(trim(arg))
      call jt9a(trim(arg))
      go to 999
   endif
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 60c2796a1..3f09cd78e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//------------------------------------------------------------ MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"