diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-30 08:45:00 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-30 08:45:00 -0500 |
| commit | 68e67d97e1f91ed11e041b67f3a1336f518c608f (patch) | |
| tree | 1de288bc05f1cf1bfec20200a60ffe99dcce77ae /tools/usb/Makefile | |
| parent | 9e03d05eee4ca45ed12749ef6c26bf616262cdd2 (diff) | |
| parent | 802eee95bde72fd0cd0f3a5b2098375a487d1eda (diff) | |
Merge tag 'v3.13-rc6' into spi-rcar
To resolve spurious merge conflicts with fixes.
Linux 3.13-rc6
Diffstat (limited to 'tools/usb/Makefile')
| -rw-r--r-- | tools/usb/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/usb/Makefile b/tools/usb/Makefile index 396d6c44e9d7..acf2165c04e6 100644 --- a/tools/usb/Makefile +++ b/tools/usb/Makefile | |||
| @@ -3,11 +3,12 @@ | |||
| 3 | CC = $(CROSS_COMPILE)gcc | 3 | CC = $(CROSS_COMPILE)gcc |
| 4 | PTHREAD_LIBS = -lpthread | 4 | PTHREAD_LIBS = -lpthread |
| 5 | WARNINGS = -Wall -Wextra | 5 | WARNINGS = -Wall -Wextra |
| 6 | CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) -I../include | 6 | CFLAGS = $(WARNINGS) -g -I../include |
| 7 | LDFLAGS = $(PTHREAD_LIBS) | ||
| 7 | 8 | ||
| 8 | all: testusb ffs-test | 9 | all: testusb ffs-test |
| 9 | %: %.c | 10 | %: %.c |
| 10 | $(CC) $(CFLAGS) -o $@ $^ | 11 | $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) |
| 11 | 12 | ||
| 12 | clean: | 13 | clean: |
| 13 | $(RM) testusb ffs-test | 14 | $(RM) testusb ffs-test |