diff options
| author | Werner Koch <[email protected]> | 2022-03-08 09:13:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-03-08 09:13:06 +0000 |
| commit | c11292fe736db6e61fad17d74f65b0b5ad9c2808 (patch) | |
| tree | e1b489e9fb709c526ab602da13e9a7a7bfbba9eb | |
| parent | gpgtar,w32: Support file names longer than MAX_PATH. (diff) | |
| download | gnupg-c11292fe736db6e61fad17d74f65b0b5ad9c2808.tar.gz gnupg-c11292fe736db6e61fad17d74f65b0b5ad9c2808.zip | |
gpg: Give Libgcrypt CFLAGS a higher priority than SQlite.
* g10/Makefile.am (AM_CFLAGS): Reorder.
--
The more specific CLFAGS should come first so these are picked up
first. We really should improve the build system to enforce this
rule. In particular /usr/local/include should come after any more
specific location.
| -rw-r--r-- | g10/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/Makefile.am b/g10/Makefile.am index 8ec771f79..f88567383 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -30,7 +30,7 @@ AM_CPPFLAGS = include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) \ +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(SQLITE3_CFLAGS) \ $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) needed_libs = ../kbx/libkeybox.a $(libcommon) ../regexp/libregexp.a @@ -181,7 +181,7 @@ gpgv_SOURCES = gpgv.c \ LDADD = $(needed_libs) ../common/libgpgrl.a \ $(ZLIBS) $(LIBINTL) $(CAPLIBS) $(NETLIBS) -gpg_LDADD = $(LDADD) $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS) $(LIBREADLINE) \ +gpg_LDADD = $(LDADD) $(LIBGCRYPT_LIBS) $(SQLITE3_LIBS) $(LIBREADLINE) \ $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \ $(LIBICONV) $(gpg_robjs) $(extra_sys_libs) gpg_LDFLAGS = $(extra_bin_ldflags) |