diff options
| -rw-r--r-- | 3rd_party/ed25519/Makefile.am | 2 | ||||
| -rw-r--r-- | common/Makefile.am | 18 | ||||
| -rw-r--r-- | cython/Makefile.am | 16 | ||||
| -rw-r--r-- | src/Makefile.am | 14 | ||||
| -rw-r--r-- | tools/Makefile.am | 5 |
5 files changed, 23 insertions, 32 deletions
diff --git a/3rd_party/ed25519/Makefile.am b/3rd_party/ed25519/Makefile.am index c475331..d8e4e04 100644 --- a/3rd_party/ed25519/Makefile.am +++ b/3rd_party/ed25519/Makefile.am @@ -6,7 +6,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ - $(openssl_CFLAGS) + $(ssl_lib_CFLAGS) AM_LDFLAGS = diff --git a/common/Makefile.am b/common/Makefile.am index 1a90571..bd09bad 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -4,22 +4,16 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ + $(ssl_lib_CFLAGS) \ + $(LFS_CFLAGS) \ $(libusbmuxd_CFLAGS) \ - $(libplist_CFLAGS) \ - $(libgnutls_CFLAGS) \ - $(libtasn1_CFLAGS) \ - $(libgcrypt_CFLAGS) \ - $(openssl_CFLAGS) \ - $(LFS_CFLAGS) + $(libplist_CFLAGS) AM_LDFLAGS = \ + $(ssl_lib_LIBS) \ + ${libpthread_LIBS} \ $(libusbmuxd_LIBS) \ - $(libplist_LIBS) \ - $(libgnutls_LIBS) \ - $(libtasn1_LIBS) \ - $(libgcrypt_LIBS) \ - $(openssl_LIBS) \ - ${libpthread_LIBS} + $(libplist_LIBS) noinst_LTLIBRARIES = libinternalcommon.la libinternalcommon_la_LIBADD = diff --git a/cython/Makefile.am b/cython/Makefile.am index 3577c4e..93ea6ed 100644 --- a/cython/Makefile.am +++ b/cython/Makefile.am @@ -3,19 +3,15 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ - $(libgnutls_CFLAGS) \ - $(libtasn1_CFLAGS) \ - $(openssl_CFLAGS) \ - $(libplist_CFLAGS) \ + $(ssl_lib_CFLAGS) \ $(LFS_CFLAGS) \ - $(PTHREAD_CFLAGS) + $(PTHREAD_CFLAGS) \ + $(libplist_CFLAGS) AM_LIBS = \ - $(libgnutls_LIBS) \ - $(libtasn1_LIBS) \ - $(openssl_LIBS) \ - $(libplist_LIBS) \ - $(PTHREAD_LIBS) + $(ssl_lib_LIBS) \ + $(PTHREAD_LIBS) \ + $(libplist_LIBS) if HAVE_CYTHON diff --git a/src/Makefile.am b/src/Makefile.am index 1c80ed6..58cf07c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,19 +6,19 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ - $(libusbmuxd_CFLAGS) \ - $(libplist_CFLAGS) \ - $(limd_glue_CFLAGS) \ $(ssl_lib_CFLAGS) \ $(LFS_CFLAGS) \ - $(PTHREAD_CFLAGS) + $(PTHREAD_CFLAGS) \ + $(libusbmuxd_CFLAGS) \ + $(libplist_CFLAGS) \ + $(limd_glue_CFLAGS) AM_LDFLAGS = \ + $(ssl_lib_LIBS) \ + $(PTHREAD_LIBS) \ $(libusbmuxd_LIBS) \ $(libplist_LIBS) \ - $(limd_glue_LIBS) \ - $(ssl_lib_LIBS) \ - $(PTHREAD_LIBS) + $(limd_glue_LIBS) lib_LTLIBRARIES = libimobiledevice-1.0.la libimobiledevice_1_0_la_LIBADD = $(top_builddir)/common/libinternalcommon.la diff --git a/tools/Makefile.am b/tools/Makefile.am index 47e05b2..bd93631 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -4,6 +4,7 @@ AM_CPPFLAGS = \ AM_CFLAGS = \ $(GLOBAL_CFLAGS) \ + $(ssl_lib_CFLAGS) \ $(libplist_CFLAGS) \ $(LFS_CFLAGS) @@ -48,7 +49,7 @@ idevicename_LDFLAGS = $(AM_LDFLAGS) idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la idevicepair_SOURCES = idevicepair.c -idevicepair_CFLAGS = $(AM_CFLAGS) $(ssl_lib_CFLAGS) +idevicepair_CFLAGS = $(AM_CFLAGS) idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) $(ssl_lib_LIBS) idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la $(limd_glue_LIBS) @@ -63,7 +64,7 @@ idevice_id_LDFLAGS = $(AM_LDFLAGS) idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la idevicebackup_SOURCES = idevicebackup.c -idevicebackup_CFLAGS = $(AM_CFLAGS) $(ssl_lib_CFLAGS) $(limd_glue_CFLAGS) +idevicebackup_CFLAGS = $(AM_CFLAGS) $(limd_glue_CFLAGS) idevicebackup_LDFLAGS = $(AM_LDFLAGS) $(ssl_lib_LIBS) $(limd_glue_LIBS) idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |