diff options
| author | Ulf Hermann <[email protected]> | 2017-03-01 16:57:34 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2017-04-28 13:32:51 +0000 |
| commit | 2136e330bef96512d45b8a85b245b9ea95cf5106 (patch) | |
| tree | 1067994fd72604ba14698ab1238dcff516a7e920 /src | |
| parent | 1acc27c76f9721d9647d4bbeaac98eb6dd7b2f05 (diff) | |
Generalize library names
On windows library names end with ".dll" and the prefix "lib" us usually
omitted. Take this into account and also drop the $(EXEEXT) workaround.
We don't need to use noinst_PROGRAMS as there is also noinst_DATA.
Change-Id: I7e4ba2432811d5ad85051ea0c9d5674eabf79b3c
Reviewed-by: Christian Kandeler <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c5805c97..64db1cab 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2017-04-28 Ulf Hermann <[email protected]> + + * Makefile.am: Use the predefined names for libelf, libdw, libasm, + rather than hardcoding to the elf conventions. + 2017-04-27 Ulf Hermann <[email protected]> * Makefile.am: Drop argp_LDADD. diff --git a/src/Makefile.am b/src/Makefile.am index cc852ca8..39ade95b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,9 +44,9 @@ libasm = ../libasm/libasm.a libdw = ../libdw/libdw.a -lz $(zip_LIBS) $(libelf) $(libebl) -ldl libelf = ../libelf/libelf.a -lz else -libasm = ../libasm/libasm.so -libdw = ../libdw/libdw.so -libelf = ../libelf/libelf.so +libasm = ../libasm/$(libasm_BARE) +libdw = ../libdw/$(libdw_BARE) +libelf = ../libelf/$(libelf_BARE) endif libebl = ../libebl/libebl.a libeu = ../lib/libeu.a |