blob: 9ffc5821c897f5c94b0c693086a9cc64dc7f1283 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From b379db29534ce6fa2e185f559e817398b3feb9ea Mon Sep 17 00:00:00 2001
From: Martin JaMa Jansa <Martin.Jansa@gmail.com>
Date: Thu, 11 Aug 2011 11:19:52 +0200
Subject: [PATCH] Revert "Makefile.am: Drop static dfu-util"
This reverts commit fe0426ddc04f503d148c5e5f931f16b8f674f071.
Conflicts:
src/Makefile.am
Signed-off-by: Martin JaMa Jansa <Martin.Jansa@gmail.com>
---
src/Makefile.am | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 0674413..ed87891 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
AM_CFLAGS = -Wall
-bin_PROGRAMS = dfu-util
+bin_PROGRAMS = dfu-util dfu-util_static
dfu_util_SOURCES = main.c \
dfu_load.c \
dfu_load.h \
@@ -11,3 +11,17 @@ dfu_util_SOURCES = main.c \
dfu_file.h \
quirks.c \
quirks.h
+
+dfu_util_static_SOURCES = main.c \
+ dfu_load.c \
+ dfu_load.h \
+ dfu.c \
+ dfu.h \
+ usb_dfu.h \
+ dfu_file.c \
+ dfu_file.h \
+ quirks.c \
+ quirks.h
+
+dfu_util_static_LDFLAGS = -static
+dfu_util_static_LDADD = -lusb-1.0 -lrt -lpthread
--
1.7.6
|
