More fixes for ticket:35, which was reopened.

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

1 files changed, 6 insertions, 17 deletions

diff --git a/ezdop/src/firmware/Makefile.am b/ezdop/src/firmware/Makefile.am
index 6cb674811..e619deb9f 100644
--- a/ezdop/src/firmware/Makefile.am
+++ b/ezdop/src/firmware/Makefile.am
@@ -28,33 +28,22 @@ 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  
+noinst_PROGRAMS = dopctrl.elf dopctrl.hex  
       
 EXTRA_DIST = \
     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=$(<:.c=.lst)
 
-dopctrl_elf_SOURCES = \
-    dopctrl.c
+dopctrl_elf_SOURCES = dopctrl.c
     
-#dopctrl_elfdir = $(includedir)
-
-include_HEADERS = \
-    dopctrl.h
-
-%.hex: %.elf
-	$(OBJCOPY) -O ihex -R .eeprom $< $@
+include_HEADERS = dopctrl.h
 
 dopctrl.hex : dopctrl.elf
-
+	$(OBJCOPY) -O ihex -R .eeprom dopctrl.elf dopctrl.hex
+	
 install-data-local:
 	$(INSTALL_DATA) -D $(top_builddir)/ezdop/src/firmware/dopctrl.hex $(DESTDIR)$(datadir)/dopctrl.hex
 
 uninstall-local:
 	$(RM) $(DESTDIR)$(datadir)/dopctrl.hex
-    
\ No newline at end of file