Commit Graph

29 Commits

Author SHA1 Message Date
Diane Bruce
6e2d442e5f - 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
ecf7f05964 - 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
9699d7dc6b 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
97d22ce81a 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
84aed8345d 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
e0f7661a4c 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
910e4b8065 - 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
3731d5a0c3 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
d1c8ce7315 - 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
226f768092 - 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
9471e22ff2 - 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
2fafe10891 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
99cd80593e - 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
f23845bac2 - 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
a39f662b4d 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
cdf1d6c05a 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
4b889cdf57 - 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
0cce7ee1b9 - 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
36fcb937e3 - 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
1f1e1a965f - 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
22c1dc6c79 - 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
c0e156d98c - 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
d7c23a875a - 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
cfc66c91ef - 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
f504e95c03 - 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
8a708402af - 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
1f1abc09d3 - 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
b3403ec2f9 - 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
de3e8a9c5b - 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