[Commit-gnuradio] r3357 - in gnuradio/trunk: ezdop/src/firmware gr-audio-osx/src

[jcorgan]

Author: jcorgan
Date: 2006-08-20 11:47:10 -0600 (Sun, 20 Aug 2006)
New Revision: 3357

Modified:
   gnuradio/trunk/ezdop/src/firmware/Makefile.am
   gnuradio/trunk/gr-audio-osx/src/Makefile.am
Log:
Fixes ticket:35.

Modified: gnuradio/trunk/ezdop/src/firmware/Makefile.am
===================================================================
--- gnuradio/trunk/ezdop/src/firmware/Makefile.am       2006-08-19 07:38:57 UTC 
(rev 3356)
+++ gnuradio/trunk/ezdop/src/firmware/Makefile.am       2006-08-20 17:47:10 UTC 
(rev 3357)
@@ -25,12 +25,17 @@
 CC=$(AVRGCC)
 OBJCOPY=$(AVROBJCOPY)
 
-# What's defined for rest of project not good for avr-gcc (no -pthread for 
instance)
-override CFLAGS=
-
 noinst_PROGRAMS = dopctrl.elf dopctrl.hex  
 
-dopctrl_elf_CFLAGS=-mmcu=atmega8 -funsigned-char -funsigned-bitfields 
-fpack-struct -fshort-enums -Wall -Wstrict-prototypes -Wa,-adhlns=$(<:.c=.lst)
+dopctrl_elf_CFLAGS= \
+       -mmcu=atmega8 \
+       -funsigned-char \
+       -funsigned-bitfields \
+       -fpack-struct \
+       -fshort-enums \
+       -Wall \
+       -Wstrict-prototypes \
+       -Wa,address@hidden
 
 dopctrl_elf_SOURCES = dopctrl.c
 
@@ -42,3 +47,4 @@
 firmwaredir = $(prefix)/share/ezdop
 firmware_DATA = dopctrl.hex
 
+MOSTLYCLEANFILES = *.lst *~

Modified: gnuradio/trunk/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/trunk/gr-audio-osx/src/Makefile.am 2006-08-19 07:38:57 UTC (rev 
3356)
+++ gnuradio/trunk/gr-audio-osx/src/Makefile.am 2006-08-20 17:47:10 UTC (rev 
3357)
@@ -32,7 +32,7 @@
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_osx.i                             
+       $(top_srcdir)/gr-audio-osx/src/audio_osx.i                              
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -78,8 +78,8 @@
 
 _audio_osx_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version -framework 
AudioUnit -framework CoreAudio -framework AudioToolbox
 
-audio_osx.cc audio_osx.py: audio_osx.i
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_osx -o audio_osx.cc $<
+audio_osx.cc audio_osx.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_osx -o audio_osx.cc 
$(LOCAL_IFILES)
 
 noinst_PYTHON = qa_osx.py test_audio_loop.py