automake: Reorder CFLAGS, make sure to use correct SSL library across…

… makefiles

3rd_party/ed25519/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
 	$(GLOBAL_CFLAGS) \
-	$(openssl_CFLAGS)
+	$(ssl_lib_CFLAGS)
 
 AM_LDFLAGS =
 

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)
 
 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 = 

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
 

src/Makefile.am

@@ -7,18 +7,18 @@ AM_CPPFLAGS = \
 AM_CFLAGS = \
 	$(GLOBAL_CFLAGS) \
 	$(ssl_lib_CFLAGS) \
+	$(LFS_CFLAGS) \
+	$(PTHREAD_CFLAGS) \
 	$(libusbmuxd_CFLAGS) \
 	$(libplist_CFLAGS) \
-	$(limd_glue_CFLAGS) \
-	$(LFS_CFLAGS) \
-	$(PTHREAD_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