Commit Graph

49 Commits

Author SHA1 Message Date
Joe Taylor
d31f1fde09 Updated the Makefiles
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1027 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2008-09-18 16:26:01 +00:00
Joe Taylor
a7ec391cf8 Update the *nix Makefile.in.
Removed unused stuff from deep65.F.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1020 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2008-09-16 17:41:23 +00:00
Joe Taylor
860c310dce Corrected Makefile.in; another cleanup in map65a.F90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1013 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2008-09-11 16:14:06 +00:00
Joe Taylor
60de355cb5 Cleaning up code that produces compiler warnings.
Removing some disused code.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1009 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2008-09-11 15:41:05 +00:00
Joe Taylor
04b5bd2623 Changed filename extension of plrs.F90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@1005 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2008-09-09 17:29:14 +00:00
Joe Taylor
3b2543d00e Added libportaudio.a to list of files that must be made.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@506 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-07-16 14:50:39 +00:00
Joe Taylor
efdb67fa15 Added "getdphi" to do least-squares solution for Dphi.
Updated Makefile.in
Commented out Linux calls to usleep in sleep_msec, makes it hang.
Removed duplicate code from plrr.f90.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@498 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-07-12 14:25:08 +00:00
Joe Taylor
87d4a8e03b Removed map65a0.f90, not used.
Corrected the "open(23" statement in map65a, updated Makefiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@472 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-07-05 16:08:20 +00:00
Joe Taylor
9acd8cedf9 Corrected linus makefile
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@455 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-07-02 16:28:52 +00:00
Joe Taylor
90be033bce Linux makefile additions for plrr, plrs.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@454 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-07-02 16:03:44 +00:00
Joe Taylor
2ae6627bbb Fixed int(id) ... in savetf2; fixed Makefiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@445 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-29 23:03:16 +00:00
Joe Taylor
e95ff3d9db All is in place for double-buffering of ss(), ss5(), savg().
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@438 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-29 14:45:15 +00:00
Joe Taylor
4af2764c20 Backed out changes to r425.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@428 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-28 13:31:46 +00:00
Joe Taylor
55e7563639 Fixed several gfortran complaints.
Brought Makefile.in up to date.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@426 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-28 00:44:19 +00:00
Joe Taylor
ed12f6b0c8 Changes to compile on K1JT machine, Kubuntu 6.06.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@407 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-23 15:03:19 +00:00
Joe Taylor
dfd8b44002 Make it compile on Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@405 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-22 14:38:03 +00:00
Joe Taylor
45b85bb7a8 Many fixes to make it work on Linux.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@388 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-06-13 17:05:57 +00:00
Joe Taylor
b6e77a28b8 Fix Makefile.in after removing more unneeded routines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@331 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-01-09 17:14:55 +00:00
Joe Taylor
c37cfaf081 Fixed *nix Makefile.in
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@329 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-01-09 15:32:53 +00:00
Joe Taylor
0074262ee4 Fixed makefile.in for *nix compiles.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@325 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2007-01-08 21:46:32 +00:00
Diane Bruce
7dd23b7c2d - Back this change out as it breaks compile
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@311 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-23 08:25:00 +00:00
Diane Bruce
2339ca4b6f - replicated --f77exec --f90exec, this simple change allows compilation
with numpy rather than separate f2py and scipy packages.
  http://numpy.scipy.org/



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@310 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-22 17:17:45 +00:00
J C Dutton
55e50a3fa4 Prevent warning:
warning: creating a DT_TEXTREL in object.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@294 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-10 12:42:47 +00:00
Joe Taylor
3bda9f4160 Must compile deep65.o without optimization.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@292 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-09 22:05:10 +00:00
J C Dutton
d22c86a419 Do not try to compile deep65.F twice.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@291 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-09 19:15:06 +00:00
Joe Taylor
fe32de68b5 Fix Makefile.in so that JT65code will be compiled.
Corrected a line in Makefile.win.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@286 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-07 18:58:49 +00:00
Diane Bruce
39984b3686 - Why on earth libtool is needed for a simple rm?
- add distclean as a target to main Makefile



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@284 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-07 16:12:46 +00:00
Joe Taylor
8c9ed820c8 1. General code cleanup. Most compiler warning messages have been silenced.
2. "/A" added to list of optional callsign suffixes.
3. Improved algorithm for measuring error in soundcard sample rates.
4. Optional 5-sec shift of input data, to catch some clock errors.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@274 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-09-06 18:09:05 +00:00
Diane Bruce
cc3c818019 - This should fix missing -lrt for those systems that need it
- I've cleaned up the configure a bit more as well



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@256 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-10 19:36:41 +00:00
Diane Bruce
12778afe8f - Make sure compiled python code gets cleaned as well
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@248 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-09 20:04:28 +00:00
Diane Bruce
0b094f37af - first part of update for new portaudio
- fix typo in configure
- point Makefile and new location for portaudio.a
- Still have to import new portaudio over top of this



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@246 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-08-09 19:51:29 +00:00
Joe Taylor
6601699c3b Updated Makefile.in
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@214 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-29 16:15:45 +00:00
Diane Bruce
eac317e80d - Cleaned up portaudio-v19 compile/clean a bit
- Fixed more missing merges, start_threads needs to pass PttPort, devin_name
  devout_name
- start_oss.c needs to use devin_name, devout_name



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@190 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-07-06 13:44:34 +00:00
Diane Bruce
0c9559732d - add --enable-g95 and --enable-gfortran hooks
- add start of --enable-jack support



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@161 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-13 04:50:00 +00:00
J C Dutton
c2ceb42b28 Summary: Merge in linux branch
svn+ssh://svn.berlios.de/svnroot/repos/wsjt/WSJT/branches/linux
merged into
svn+ssh://svn.berlios.de/svnroot/repos/wsjt/trunk



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@155 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-04-05 20:07:32 +00:00
Joe Taylor
1e53db0b9d Updated Makefile.in.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@118 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-25 18:51:57 +00:00
Diane Bruce
bc694f8c9c - remove conf.h hence remove conf.h.in as well, and modify
all files previously using conf.h
- pass defs found into the Makefile instead
- add parallel port enable to configure --enable-parallel vs. --enable-serial
- use code (partially contributed by yours truly anyway) from cwdaemon to add
  parallel port support for *nix. 

I've not tested parallel port operation, it should match what cwdaemon
does, which is convenient.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@113 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-16 02:07:25 +00:00
Diane Bruce
1810b0b2dc - Add AUDIOSRCS in Makefile.in, which will be filled in with the appropriate
source files needed for the audio system chosen. Note in particular
  a2d.f90 no longer needs to be wrapped with a #ifdef PORTAUDIO since
  it is now only compiled and linked when needed.

  Tested on portaudio here, but untested on alsa. Please test that
  I have not screwed it up on alsa or windows. ;-)



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@102 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 16:15:50 +00:00
Diane Bruce
eaed0b81eb - change from start_threads.c to start_alsa.c start_portaudio.c etc.
- split start_threads.c into start_alsa.c and start_portaudio.c
- make configure/Makefile add start_alsa or start_portaudio as needed
  instead of start_threads

  Untested on ALSA, works fine with PORTAUDIO



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@100 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:47:35 +00:00
Diane Bruce
110ef8779d - Adds for documentation purposes the fortran options for debug
i.e. traceback would be very nice.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@99 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-14 15:15:55 +00:00
Diane Bruce
d52e1d7b1d - Ok, mix and match Makefile.in.joe into Makefile.in
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@91 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-13 01:50:01 +00:00
Diane Bruce
d5453c2ba9 - Ok, added some rules to build .c, .f and .f90 objects
Next step will be to break up the huge f2py 



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@89 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-12 05:13:07 +00:00
Diane Bruce
0fcec320a0 - Cleaned up Makefile to use F2PY instead of calling Python
fixed some dependancies to force recompile if a file is changed.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@86 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-11 20:16:13 +00:00
Diane Bruce
0df428a28b - cleaned up the configure a bit more, it will now pick a default audio method
if none given.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@82 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 21:35:37 +00:00
Diane Bruce
2858f3b9c9 - ok, this should enable Bobs portaudio fixes and ALSA depending on
--enable options. 

This will have to be cleaned up a lot more to minimise #ifdef's
a2d_() is needed for portaudio which is needed by both windows and *nix
but only a small piece of start_threads.c is needed for portaudio
the ALSA part is #ifdef'd out when USE_PORTAUDIO is enabled.
audio_init.f90 and a2d.f90 now have #ifdef's on USE_PORTAUDIO
instead of Win32.

Lots to do still.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@73 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-10 02:43:23 +00:00
Diane Bruce
58fe7642c8 - check correct HAS_ASOUNDLIB_H flag in start_threads.c
- look for alsa/asoundlib.h and set HAS_ASOUNDLIB_H if present
- also rework Makefile to pass proper flags

This should be it for alsa and portaudio.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@70 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 21:30:35 +00:00
Diane Bruce
7987c826ef - cleaned up a few more stupids on configure system
- cleaned up Makefile to use LDFLAGS and CPPFLAGS
- look for asoundlib.h properly



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@69 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-09 19:18:03 +00:00
Diane Bruce
c236b4c52c - Cleaned up further using Joe's Windows makefile as a basis
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@62 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-08 03:54:50 +00:00
Diane Bruce
e1c6930cda - oops sorry about that.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@60 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2006-01-07 22:40:26 +00:00