Peter M. Groen / openhantek

Commit b6cbbae3a5701cf4153b50ed31e2438e916f9678

Authored by oliverhaag
1 parent 45479282

Add libbfd dependencies

Inline Side-by-side
Showing 3 changed files with 14 additions and 2 deletions
openhantek-extractfw/ChangeLog
  View file @b6cbbae
@@ -32,3 +32,12 @@ @@ -32,3 +32,12 @@
32 * Version 0.7.0: 32 * Version 0.7.0:
33 * Renamed this extraction tool to openhantek-extractfw 33 * Renamed this extraction tool to openhantek-extractfw
34 * Added fwget.sh for automatic driver download and firmware extraction 34 * Added fwget.sh for automatic driver download and firmware extraction
  35 +
  36 +2011-11-20 Oliver Haag <oliver.haag@gmail.com>
  37 +* Updated deprecated used rules
  38 +
  39 +2012-11-25 Oliver Haag <oliver.haag@gmail.com>
  40 +* Added additional DSO-2090 product ID
  41 +
  42 +2013-03-13 Oliver Haag <oliver.haag@gmail.com>
  43 +* Link libbfd dependencies explicitly (Required by recent gcc/libbfd)
openhantek-extractfw/Makefile.am
  View file @b6cbbae
1 METASOURCES = AUTO 1 METASOURCES = AUTO
2 bin_PROGRAMS = openhantek-extractfw 2 bin_PROGRAMS = openhantek-extractfw
3 openhantek_extractfw_LDFLAGS = $(all_libraries) 3 openhantek_extractfw_LDFLAGS = $(all_libraries)
4 -openhantek_extractfw_LDADD = -lbfd 4 +openhantek_extractfw_LDADD = -lbfd -liberty -lz -ldl
5 openhantek_extractfw_SOURCES = extractfw.c 5 openhantek_extractfw_SOURCES = extractfw.c
6 noinst_DATA = 90-hantek.rules 6 noinst_DATA = 90-hantek.rules
openhantek-extractfw/configure.in
  View file @b6cbbae
@@ -13,7 +13,10 @@ AM_INIT_AUTOMAKE @@ -13,7 +13,10 @@ AM_INIT_AUTOMAKE
13 AC_PROG_CC 13 AC_PROG_CC
14 14
15 # Checks for libraries. 15 # Checks for libraries.
16 -AC_CHECK_LIB([bfd], [main], [], AC_MSG_ERROR([The bfd library is missing])) 16 +AC_CHECK_LIB([dl], [dlopen], [], AC_MSG_ERROR([libdl is missing]))
  17 +AC_CHECK_LIB([z], [deflate], [], AC_MSG_ERROR([libz is missing]))
  18 +AC_CHECK_LIB([iberty], [objalloc_create], [], AC_MSG_ERROR([libiberty is missing]))
  19 +AC_CHECK_LIB([bfd], [bfd_openr], [], AC_MSG_ERROR([libbfd is missing]))
17 20
18 # Checks for header files. 21 # Checks for header files.
19 AC_CHECK_HEADERS([malloc.h string.h]) 22 AC_CHECK_HEADERS([malloc.h string.h])