Skip to content

Commit

Permalink
tools: Rename icat to inetcat due to name conflict with sleuthkit
Browse files Browse the repository at this point in the history
See #84
  • Loading branch information
nikias committed Nov 26, 2019
1 parent 8f3afaf commit e97cebe
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 6 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -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
~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.61)
AC_INIT(libusbmuxd, 2.0.0, [email protected])
AC_INIT(libusbmuxd, 2.0.1, [email protected])
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip check-news])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_CONFIG_SRCDIR([src/])
Expand Down
10 changes: 5 additions & 5 deletions tools/Makefile.am
Original file line number Diff line number Diff line change
@@ -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

File renamed without changes.

0 comments on commit e97cebe

Please sign in to comment.