diff options
| author | 2023-10-07 01:49:55 +0200 | |
|---|---|---|
| committer | 2023-10-07 01:49:55 +0200 | |
| commit | ba2fb48cfa4d62d86bc22913c87a05ffac5319c2 (patch) | |
| tree | 7f661565a3b854c1a0601ed6eaa86dfb5ea1361d /tools | |
| parent | 6fc41f57fc607df9b07446ca45bdf754225c9bd9 (diff) | |
| download | libimobiledevice-ba2fb48cfa4d62d86bc22913c87a05ffac5319c2.tar.gz libimobiledevice-ba2fb48cfa4d62d86bc22913c87a05ffac5319c2.tar.bz2 | |
automake: Reorder CFLAGS to fix build issues and use correct SSL library flags across Makefiles
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
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 = \ | |||
| 4 | 4 | ||
| 5 | AM_CFLAGS = \ | 5 | AM_CFLAGS = \ |
| 6 | $(GLOBAL_CFLAGS) \ | 6 | $(GLOBAL_CFLAGS) \ |
| 7 | $(ssl_lib_CFLAGS) \ | ||
| 7 | $(libplist_CFLAGS) \ | 8 | $(libplist_CFLAGS) \ |
| 8 | $(LFS_CFLAGS) | 9 | $(LFS_CFLAGS) |
| 9 | 10 | ||
| @@ -48,7 +49,7 @@ idevicename_LDFLAGS = $(AM_LDFLAGS) | |||
| 48 | idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la | 49 | idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
| 49 | 50 | ||
| 50 | idevicepair_SOURCES = idevicepair.c | 51 | idevicepair_SOURCES = idevicepair.c |
| 51 | idevicepair_CFLAGS = $(AM_CFLAGS) $(ssl_lib_CFLAGS) | 52 | idevicepair_CFLAGS = $(AM_CFLAGS) |
| 52 | idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) $(ssl_lib_LIBS) | 53 | idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) $(ssl_lib_LIBS) |
| 53 | idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la $(limd_glue_LIBS) | 54 | idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la $(limd_glue_LIBS) |
| 54 | 55 | ||
| @@ -63,7 +64,7 @@ idevice_id_LDFLAGS = $(AM_LDFLAGS) | |||
| 63 | idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la | 64 | idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
| 64 | 65 | ||
| 65 | idevicebackup_SOURCES = idevicebackup.c | 66 | idevicebackup_SOURCES = idevicebackup.c |
| 66 | idevicebackup_CFLAGS = $(AM_CFLAGS) $(ssl_lib_CFLAGS) $(limd_glue_CFLAGS) | 67 | idevicebackup_CFLAGS = $(AM_CFLAGS) $(limd_glue_CFLAGS) |
| 67 | idevicebackup_LDFLAGS = $(AM_LDFLAGS) $(ssl_lib_LIBS) $(limd_glue_LIBS) | 68 | idevicebackup_LDFLAGS = $(AM_LDFLAGS) $(ssl_lib_LIBS) $(limd_glue_LIBS) |
| 68 | idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la | 69 | idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la |
| 69 | 70 | ||
