diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-02 15:26:07 +0100 |
commit | f6c5a79972bcd216429484eb706fc47c7bb52a75 (patch) | |
tree | 4f5e17701c66df5d2359486687f1fd41b2fb469e /tools/Makefile | |
parent | 00fa581bc6acc3158b3008019e81802a5d70418c (diff) | |
parent | b8e1fbce6811e906e7c8bd21f4e7fe1aa4881585 (diff) |
resolve merge conflict
Diffstat (limited to 'tools/Makefile')
-rw-r--r-- | tools/Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile index d40f35f16..2d29372dc 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,9 +17,6 @@ endif ifeq ($(ADK_HOST_NEED_SYSLINUX),y) TARGETS+=syslinux endif -ifeq ($(ADK_HOST_NEED_GPERF),y) -TARGETS+=gperf -endif ifeq ($(ADK_HOST_NEED_JFFS2),y) TARGETS+=mtd-utils endif |