diff options
| -rw-r--r-- | config/grc_ezdop.m4 | 18 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | ezdop/src/firmware/Makefile.am | 13 |
3 files changed, 19 insertions, 18 deletions
diff --git a/config/grc_ezdop.m4 b/config/grc_ezdop.m4 index 818e17100..40336c0e9 100644 --- a/config/grc_ezdop.m4 +++ b/config/grc_ezdop.m4 @@ -33,24 +33,30 @@ AC_DEFUN([GRC_EZDOP],[ succeeded=yes - AC_PATH_PROG(AVRGCC, [avr-gcc -v], no) - if test $AVRGCC = no; then + # Firmware build requires Atmel AVR microcontroller port of GCC + AC_PATH_PROG([AVRGCC], [avr-gcc -v], [no]) + if test x$AVRGCC = xno; then succeeded=no fi - AC_PATH_PROG(AVROBJCOPY, [avr-objcopy], no) - if test $AVROBJCOPY = no; then + # ...and binutils + AC_PATH_PROG([AVROBJCOPY], [avr-objcopy], [no]) + if test x$AVROBJCOPY = xno; then succeeded=no fi + # ...and standard library (test not working yet) + #AC_CHECK_HEADERS([avr/io.h],[],[succeeded=no]) + + # Device access is via libftdi AC_LANG_PUSH(C) AC_CHECK_HEADERS([ftdi.h],[],[succeeded=no]) save_LIBS="$LIBS" - AC_SEARCH_LIBS(ftdi_init, [ftdi],[FTDI_LIBS="$LIBS"],[succeeded=no]) + AC_SEARCH_LIBS([ftdi_init], [ftdi],[FTDI_LIBS="$LIBS"],[succeeded=no]) LIBS="$save_LIBS" AC_LANG_POP - if test $succeeded = yes; then + if test x$succeeded = xyes; then EZDOP_INCLUDES='-I$(top_srcdir)/ezdop/src/host/ezdop/ -I$(top_srcdir)/ezdop/src/firmware/' EZDOP_LIBS='-lezdop' AC_SUBST(FTDI_LIBS) diff --git a/configure.ac b/configure.ac index 3e3a0e163..dcec3b0ed 100644 --- a/configure.ac +++ b/configure.ac @@ -157,7 +157,7 @@ GRC_GR_USRP dnl this must come after GRC_USRP GRC_GR_AUDIO_ALSA GRC_GR_AUDIO_JACK GRC_GR_AUDIO_OSS -GRC_GR_AUDIO_OSX dnl ***NOT TESTED*** +GRC_GR_AUDIO_OSX GRC_GR_AUDIO_PORTAUDIO dnl ***NOT TESTED*** GRC_GR_AUDIO_WINDOWS dnl ***NOT TESTED*** GRC_GR_ATSC @@ -171,8 +171,8 @@ GRC_GR_WXGUI GRC_PMT GRC_MBLOCK dnl this must come after GRC_PMT GRC_GR_TRELLIS -dnl GRC_EZDOP dnl disable until grc_ezdop.m4 fixed -dnl GRC_GR_EZDOP dnl this must come after GRC_EZDOP +GRC_EZDOP +GRC_GR_EZDOP dnl this must come after GRC_EZDOP dnl Has list of successfully configured components AC_SUBST([subdirs],$subdirs) diff --git a/ezdop/src/firmware/Makefile.am b/ezdop/src/firmware/Makefile.am index e619deb9f..eaded7c4a 100644 --- a/ezdop/src/firmware/Makefile.am +++ b/ezdop/src/firmware/Makefile.am @@ -29,21 +29,16 @@ OBJCOPY=$(AVROBJCOPY) override CFLAGS= 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_SOURCES = dopctrl.c - + 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 +firmwaredir = $(prefix)/share/ezdop +firmware_DATA = dopctrl.hex + |