* fix the build on precise, bump the version number

Author: nomis52

Makefile.am

@@ -1,6 +1,4 @@
 CLOCAL         = aclocal -I $(auxdir)
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = debian src
-
-EXTRA_DIST = README.debian
+SUBDIRS = src

README.debian

@@ -95,6 +95,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 

config.h.in

@@ -4,7 +4,7 @@
 AC_PREREQ(2.57)
 AC_INIT(configure.in)
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(artnet-examples, 0.3.10)
+AM_INIT_AUTOMAKE(artnet-examples, 0.3.12)
 AM_CONFIG_HEADER(config.h)
 
 # Checks for programs.
@@ -20,9 +20,8 @@ AM_CONDITIONAL(HAVE_NCURSES, test "${have_ncurses}" = "yes")
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h malloc.h stdlib.h string.h sys/ioctl.h sys/time.h sys/timeb.h termios.h unistd.h])
 
-
 # check for libartnet
-PKG_CHECK_MODULES(libartnet, [libartnet >= 1.0.6])
+PKG_CHECK_MODULES(libartnet, [libartnet >= 1.1.0])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -37,4 +36,4 @@ AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([gettimeofday atexit ftime memset select strdup strerror])
 
-AC_OUTPUT(Makefile debian/Makefile src/Makefile)
+AC_OUTPUT(Makefile src/Makefile)

configure.in

@@ -1,21 +1,24 @@
 
-AM_CFLAGS = -Wall -Werror 
-AM_LDFLAGS = $(libartnet_LIBS)
+AM_CFLAGS = -Wall -Werror
+LDADD = $(libartnet_LIBS)
 
 if HAVE_NCURSES
 NCURSES_PROGS = artnet_dmxconsole artnet_dmxmonitor
 artnet_dmxconsole_SOURCES = artnet-dmxconsole.c
-artnet_dmxconsole_LDADD = @LIBS@ -lcurses
+artnet_dmxconsole_LDADD = $(libartnet_LIBS) -lcurses
 
 artnet_dmxmonitor_SOURCES = artnet-dmxmonitor.c
-artnet_dmxmonitor_LDADD = @LIBS@ -lcurses
+artnet_dmxmonitor_LDADD = $(libartnet_LIBS) -lcurses
 endif
 
 
-bin_PROGRAMS = artnet_usb artnet_discover artnet_flood_rx artnet_flood_tx artnet_firmware_node artnet_firmware_server artnet_multiport artnet_profile_tx artnet_profile_rx artnet_rdm_output artnet_setdmx $(NCURSES_PROGS)
+bin_PROGRAMS = artnet_usb artnet_discover artnet_flood_rx artnet_flood_tx \
+               artnet_firmware_node artnet_firmware_server artnet_multiport \
+               artnet_profile_tx artnet_profile_rx artnet_rdm_output \
+               artnet_setdmx $(NCURSES_PROGS)
 
 artnet_usb_SOURCES = artnet-usb.c
-artnet_usb_LDADD = @LIBS@ -lpthread
+artnet_usb_LDADD = $(libartnet_LIBS) -lpthread
 artnet_discover_SOURCES = artnet-discover.c
 artnet_flood_rx_SOURCES = artnet-flood-rx.c
 artnet_flood_tx_SOURCES = artnet-flood-tx.c

src/Makefile.am

@@ -377,7 +377,10 @@ void load(const char *filename)
       fprintf(stderr, "unable to open %s : %s\n", filename, strerror(errno));
       exit(1);
     }
-  fread(dmxsave, MAXCHANNELS, MAXFKEY, file);
+  if (MAXCHANNELS != fread(dmxsave, MAXCHANNELS, MAXFKEY, file)) {
+    fprintf(stderr, "Failed to read %s\n", filename);
+    exit(1);
+  }
   while(!feof(file))
     {
       char buf[1024];