diff options
| author | Ulf Hermann <[email protected]> | 2019-01-30 10:24:44 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2019-08-26 07:50:53 +0000 |
| commit | d2db6ecd9994210e75fb4362d781ec882ec7238a (patch) | |
| tree | de0a6af582218030dcae43ed1a6911756f7527d1 /libelf | |
| parent | 188c2613b3744345e2ba3d4cfd0bcc47b12b74ae (diff) | |
Split the "selfcontained" configure option in twoHEADQtCreator4.15.1QtCreator4.15.0-rc1QtCreator4.15.0-beta2QtCreator4.15.0-beta1QtCreator4.15.0QtCreator4.14.2QtCreator4.14.1QtCreator4.14.0-rc1QtCreator4.14.0-beta2QtCreator4.14.0-beta1QtCreator4.14.0QtCreator4.13.3QtCreator4.13.2QtCreator4.13.1QtCreator4.13.0-rc1QtCreator4.13.0-beta2QtCreator4.13.0-beta1QtCreator4.13.0QtCreator4.12.4QtCreator4.12.3QtCreator4.12.2QtCreator4.12.1QtCreator4.12.0-rc1QtCreator4.12.0-beta2QtCreator4.12.0-beta1QtCreator4.12.0QtCreator4.11.2QtCreator4.11.0-rc1QtCreator4.11.0-beta2QtCreator4.11.0-beta1QtCreator4.11.0master5.04.154.144.134.124.1112.011.010.0
upstream is growing an option to install elf.h. We want to use that.
Change-Id: Ica5bf0cdf281eb17ef29e0e1029662a5a9d875b1
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'libelf')
| -rw-r--r-- | libelf/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libelf/Makefile.am b/libelf/Makefile.am index 015a07e3..9d6da6b4 100644 --- a/libelf/Makefile.am +++ b/libelf/Makefile.am @@ -38,6 +38,16 @@ noinst_LIBRARIES = libelf_pic.a noinst_DATA = $(libelf_BARE) include_HEADERS = libelf.h gelf.h nlist.h +noinst_HEADERS = abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ + version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h \ + chdr_xlate.h + +if INSTALL_ELFH +include_HEADERS += elf.h +else +noinst_HEADERS += elf.h +endif + pkginclude_HEADERS = elf-knowledge.h libelf_a_SOURCES = elf_version.c elf_hash.c elf_error.c elf_fill.c \ @@ -149,16 +159,6 @@ endif install: install-am install-lib uninstall: uninstall-am uninstall-lib -noinst_HEADERS = abstract.h common.h exttypes.h gelf_xlate.h libelfP.h \ - version_xlate.h gnuhash_xlate.h note_xlate.h dl-hash.h \ - chdr_xlate.h - -if SELFCONTAINED -include_HEADERS += elf.h -else -noinst_HEADERS += elf.h -endif - EXTRA_DIST = libelf.map CLEANFILES += $(am_libelf_pic_a_OBJECTS) $(libelf_SONAME) $(libelf_BARE) |