From 440a026379ff111aaa8314db1c29ffae8f482824 Mon Sep 17 00:00:00 2001 From: Martin JaMa Jansa Date: Thu, 11 Aug 2011 11:19:52 +0200 Subject: [PATCH 2/2] Revert "Makefile.am: Drop static dfu-util" This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. Signed-off-by: Martin JaMa Jansa Signed-off-by: Martin Jansa --- configure.ac | 2 +- src/Makefile.am | 20 +++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fb58473..09b9e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AS_IF([test x$native_libusb = xno], [ AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) ]) -LIBS="$LIBS $USB_LIBS" +LIBS="$LIBS $USB_LIBS -lpthread" CFLAGS="$CFLAGS $USB_CFLAGS" # Checks for header files. diff --git a/src/Makefile.am b/src/Makefile.am index 99df307..28d53f7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ AM_CFLAGS = -Wall -bin_PROGRAMS = dfu-util dfu-suffix +bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix dfu_util_SOURCES = main.c \ portable.h \ dfu_load.c \ @@ -17,6 +17,24 @@ dfu_util_SOURCES = main.c \ quirks.c \ quirks.h +dfu_util_static_SOURCES = main.c \ + portable.h \ + dfu_load.c \ + dfu_load.h \ + dfuse.c \ + dfuse.h \ + dfuse_mem.c \ + dfuse_mem.h \ + dfu.c \ + dfu.h \ + usb_dfu.h \ + dfu_file.c \ + dfu_file.h \ + quirks.c \ + quirks.h + +dfu_util_static_LDFLAGS = -static + dfu_suffix_SOURCES = suffix.c \ dfu_file.h \ dfu_file.c \ -- 2.0.2