diff options
Diffstat (limited to 'libidn')
| -rw-r--r-- | libidn/ChangeLog | 4 | ||||
| -rw-r--r-- | libidn/Makefile | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libidn/ChangeLog b/libidn/ChangeLog index e8130bb5b4..7a48fd5c6d 100644 --- a/libidn/ChangeLog +++ b/libidn/ChangeLog @@ -1,3 +1,7 @@ +2014-02-26 Joseph Myers <joseph@codesourcery.com> + + * Makefile: Include Makeconfig immediately after defining subdir. + 2013-10-30 Mike Frysinger <vapier@gentoo.org> * configure.in: Moved to ... diff --git a/libidn/Makefile b/libidn/Makefile index 542840d947..a40f08e9fd 100644 --- a/libidn/Makefile +++ b/libidn/Makefile @@ -19,6 +19,8 @@ subdir := libidn +include ../Makeconfig + routines = idn-stub extra-libs = libcidn @@ -27,9 +29,6 @@ extra-libs-others = $(extra-libs) libcidn-routines := punycode toutf8 nfkc stringprep rfc3454 profiles idna \ iconvme - -include $(..)Makeconfig - libcidn-inhibit-o = $(filter-out .os,$(object-suffixes)) include $(..)Rules |