diff options
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 11 | ||||
| -rw-r--r-- | tools/irecovery.c (renamed from src/irecovery.c) | 0 |
5 files changed, 14 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 3c8e304..69bb74a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,5 @@ -AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src include - -DISTCHECK_CONFIGURE_FLAGS = +SUBDIRS = src include tools pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libirecovery.pc - -indent: - indent -kr -ut -ts4 -l120 src/*.c src/*.h - +pkgconfig_DATA = libirecovery.pc
\ No newline at end of file diff --git a/configure.ac b/configure.ac index 0a89518..38a0d6c 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,7 @@ AC_OUTPUT([ Makefile src/Makefile include/Makefile +tools/Makefile libirecovery.pc ]) diff --git a/src/Makefile.am b/src/Makefile.am index a7027ee..ae0b2d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -9,9 +9,3 @@ libirecovery_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIRECOVERY_SO_VERSION) libirecovery_la_SOURCES = \ libirecovery.c -bin_PROGRAMS = irecovery - -irecovery_SOURCES = irecovery.c -irecovery_CFLAGS = $(AM_CFLAGS) -irecovery_LDFLAGS = $(AM_LDFLAGS) $(IRECOVERY_LIBS) -irecovery_LDADD = ./libirecovery.la diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 0000000..ac062c5 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,11 @@ +AM_CPPFLAGS = -I$(top_srcdir)/include + +AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS) +AM_LDFLAGS = $(libusb_LIBS) -lreadline + +bin_PROGRAMS = irecovery + +irecovery_SOURCES = irecovery.c +irecovery_CFLAGS = $(AM_CFLAGS) +irecovery_LDFLAGS = $(AM_LDFLAGS) +irecovery_LDADD = $(top_srcdir)/src/libirecovery.la
\ No newline at end of file diff --git a/src/irecovery.c b/tools/irecovery.c index 075ee79..075ee79 100644 --- a/src/irecovery.c +++ b/tools/irecovery.c |