diff options
| author |  Nikias Bassen | 2023-10-07 01:49:55 +0200 |
|---|---|---|
| committer | Nikias Bassen | 2023-10-07 01:49:55 +0200 |
| commit | ba2fb48cfa4d62d86bc22913c87a05ffac5319c2 (patch) | |
| tree | 7f661565a3b854c1a0601ed6eaa86dfb5ea1361d /common | |
| 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 'common')
| -rw-r--r-- | common/Makefile.am | 18 |
1 files changed, 6 insertions, 12 deletions
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 = \ | |||
| 4 | 4 | ||
| 5 | AM_CFLAGS = \ | 5 | AM_CFLAGS = \ |
| 6 | $(GLOBAL_CFLAGS) \ | 6 | $(GLOBAL_CFLAGS) \ |
| 7 | $(ssl_lib_CFLAGS) \ | ||
| 8 | $(LFS_CFLAGS) \ | ||
| 7 | $(libusbmuxd_CFLAGS) \ | 9 | $(libusbmuxd_CFLAGS) \ |
| 8 | $(libplist_CFLAGS) \ | 10 | $(libplist_CFLAGS) |
| 9 | $(libgnutls_CFLAGS) \ | ||
| 10 | $(libtasn1_CFLAGS) \ | ||
| 11 | $(libgcrypt_CFLAGS) \ | ||
| 12 | $(openssl_CFLAGS) \ | ||
| 13 | $(LFS_CFLAGS) | ||
| 14 | 11 | ||
| 15 | AM_LDFLAGS = \ | 12 | AM_LDFLAGS = \ |
| 13 | $(ssl_lib_LIBS) \ | ||
| 14 | ${libpthread_LIBS} \ | ||
| 16 | $(libusbmuxd_LIBS) \ | 15 | $(libusbmuxd_LIBS) \ |
| 17 | $(libplist_LIBS) \ | 16 | $(libplist_LIBS) |
| 18 | $(libgnutls_LIBS) \ | ||
| 19 | $(libtasn1_LIBS) \ | ||
| 20 | $(libgcrypt_LIBS) \ | ||
| 21 | $(openssl_LIBS) \ | ||
| 22 | ${libpthread_LIBS} | ||
| 23 | 17 | ||
| 24 | noinst_LTLIBRARIES = libinternalcommon.la | 18 | noinst_LTLIBRARIES = libinternalcommon.la |
| 25 | libinternalcommon_la_LIBADD = | 19 | libinternalcommon_la_LIBADD = |