From: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Sun, 20 Aug 2006 17:47:10 +0000 (+0000)
Subject: Fixes ticket:35.
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=0b271125ac42ed3a50082a2bb352c64b9e2d292e;p=debian%2Fgnuradio

Fixes ticket:35.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3357 221aa14e-8319-0410-a670-987f0aec2ac5
---

diff --git a/ezdop/src/firmware/Makefile.am b/ezdop/src/firmware/Makefile.am
index eaded7c4..06add7af 100644
--- a/ezdop/src/firmware/Makefile.am
+++ b/ezdop/src/firmware/Makefile.am
@@ -25,12 +25,17 @@ datadir = $(prefix)/share/ezdop
 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,-adhlns=$@.lst
 
 dopctrl_elf_SOURCES = dopctrl.c
 
@@ -42,3 +47,4 @@ dopctrl.hex : dopctrl.elf
 firmwaredir = $(prefix)/share/ezdop
 firmware_DATA = dopctrl.hex
 
+MOSTLYCLEANFILES = *.lst *~
diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am
index 3c2d9089..4e4a6c53 100644
--- a/gr-audio-osx/src/Makefile.am
+++ b/gr-audio-osx/src/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST = run_tests.in
 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_LIBADD = 			\
 
 _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