| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From c2aab3b9ae1febcb6b4c6561a59df1930a57b394 Mon Sep 17 00:00:00 2001 |
| 2 | From: Martin JaMa Jansa <Martin.Jansa@gmail.com> |
| 3 | Date: Thu, 11 Aug 2011 11:19:52 +0200 |
| 4 | Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util" |
| 5 | |
| 6 | This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071. |
| 7 | |
| 8 | Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com> |
| 9 | --- |
| 10 | configure.ac | 2 +- |
| 11 | src/Makefile.am | 22 +++++++++++++++++++++- |
| 12 | 2 files changed, 22 insertions(+), 2 deletions(-) |
| 13 | |
| 14 | diff --git a/configure.ac b/configure.ac |
| 15 | index f5a43b8..6a3757e 100644 |
| 16 | --- a/configure.ac |
| 17 | +++ b/configure.ac |
| 18 | @@ -21,7 +21,7 @@ AS_IF([test x$native_libusb = xno], [ |
| 19 | AC_MSG_ERROR([*** Required libusb-1.0 >= 1.0.0 not installed ***])) |
| 20 | ]) |
| 21 | |
| 22 | -LIBS="$LIBS $USB_LIBS" |
| 23 | +LIBS="$LIBS $USB_LIBS -lpthread" |
| 24 | CFLAGS="$CFLAGS $USB_CFLAGS" |
| 25 | |
| 26 | # Checks for header files. |
| 27 | diff --git a/src/Makefile.am b/src/Makefile.am |
| 28 | index 70179c4..e8736ee 100644 |
| 29 | --- a/src/Makefile.am |
| 30 | +++ b/src/Makefile.am |
| 31 | @@ -1,6 +1,6 @@ |
| 32 | AM_CFLAGS = -Wall -Wextra |
| 33 | |
| 34 | -bin_PROGRAMS = dfu-util dfu-suffix dfu-prefix |
| 35 | +bin_PROGRAMS = dfu-util dfu-util_static dfu-suffix dfu-prefix |
| 36 | dfu_util_SOURCES = main.c \ |
| 37 | portable.h \ |
| 38 | dfu_load.c \ |
| 39 | @@ -19,6 +19,26 @@ dfu_util_SOURCES = main.c \ |
| 40 | quirks.c \ |
| 41 | quirks.h |
| 42 | |
| 43 | +dfu_util_static_SOURCES = main.c \ |
| 44 | + portable.h \ |
| 45 | + dfu_load.c \ |
| 46 | + dfu_load.h \ |
| 47 | + dfu_util.c \ |
| 48 | + dfu_util.h \ |
| 49 | + dfuse.c \ |
| 50 | + dfuse.h \ |
| 51 | + dfuse_mem.c \ |
| 52 | + dfuse_mem.h \ |
| 53 | + dfu.c \ |
| 54 | + dfu.h \ |
| 55 | + usb_dfu.h \ |
| 56 | + dfu_file.c \ |
| 57 | + dfu_file.h \ |
| 58 | + quirks.c \ |
| 59 | + quirks.h |
| 60 | + |
| 61 | +dfu_util_static_LDFLAGS = -static |
| 62 | + |
| 63 | dfu_suffix_SOURCES = suffix.c \ |
| 64 | dfu_file.h \ |
| 65 | dfu_file.c |
| 66 | -- |
| 67 | 2.7.2 |
| 68 | |