diff options
| author |  Nikias Bassen | 2019-11-26 10:21:16 +0100 |
|---|---|---|
| committer | Nikias Bassen | 2019-11-26 10:21:16 +0100 |
| commit | e97cebeaf7d8f3793b40c3e7bb3ab63853098f5d (patch) | |
| tree | 2e9d9bab469ad95f0635d1c5719c6b0e515650bf | |
| parent | 8f3afaf4cac7fcf64723be466fdb29009b34bb73 (diff) | |
| download | libusbmuxd-e97cebeaf7d8f3793b40c3e7bb3ab63853098f5d.tar.gz libusbmuxd-e97cebeaf7d8f3793b40c3e7bb3ab63853098f5d.tar.bz2 | |
tools: Rename icat to inetcat due to name conflict with sleuthkit2.0.1
See https://github.com/libimobiledevice/libusbmuxd/issues/84
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 10 | ||||
| -rw-r--r-- | tools/inetcat.c (renamed from tools/icat.c) | 0 |
4 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Version 2.0.1 +~~~~~~~~~~~~~ + +* Changes: + - Rename 'icat' tool to 'inetcat' due to name conflict with sleuthkit's icat + Version 2.0.0 ~~~~~~~~~~~~~ diff --git a/configure.ac b/configure.ac index 1ce7bf2..1c8a965 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(libusbmuxd, 2.0.0, nospam@nowhere.com) +AC_INIT(libusbmuxd, 2.0.1, nospam@nowhere.com) AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AC_CONFIG_SRCDIR([src/]) diff --git a/tools/Makefile.am b/tools/Makefile.am index e232b66..1b8c425 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1,15 +1,15 @@ AM_CFLAGS = $(GLOBAL_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/src -I$(top_srcdir)/include AM_LDFLAGS = $(libpthread_LIBS) -bin_PROGRAMS = iproxy icat +bin_PROGRAMS = iproxy inetcat iproxy_SOURCES = iproxy.c iproxy_CFLAGS = $(AM_CFLAGS) iproxy_LDFLAGS = $(AM_LDFLAGS) iproxy_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la -icat_SOURCES = icat.c -icat_CFLAGS = $(AM_CFLAGS) -icat_LDFLAGS = $(AM_LDFLAGS) -icat_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la +inetcat_SOURCES = inetcat.c +inetcat_CFLAGS = $(AM_CFLAGS) +inetcat_LDFLAGS = $(AM_LDFLAGS) +inetcat_LDADD = $(top_builddir)/src/libusbmuxd.la $(top_builddir)/common/libinternalcommon.la diff --git a/tools/icat.c b/tools/inetcat.c index b306a47..b306a47 100644 --- a/tools/icat.c +++ b/tools/inetcat.c |