diff options
| author | Frank Ch. Eigler <fche@redhat.com> | 2019-09-03 13:51:07 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@redhat.com> | 2019-09-03 13:51:07 -0400 |
| commit | a2c04532cb17c75b066b48cf3cc31cf8a89f5ee0 (patch) | |
| tree | 81a78bcd8a8f98ef41e7d0b88b6a7b452244a860 | |
| parent | b9ea6361cb4e3b8a4cbdb9db020a000d5ac5b1e0 (diff) | |
dbgserver: post-0.177 merge tweaks
| -rw-r--r-- | dbgserver/Makefile.am | 12 | ||||
| -rw-r--r-- | libdw/Makefile.am | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/dbgserver/Makefile.am b/dbgserver/Makefile.am index 81c3582a..9ee3acb5 100644 --- a/dbgserver/Makefile.am +++ b/dbgserver/Makefile.am @@ -34,8 +34,8 @@ AM_CPPFLAGS += -I$(srcdir) -I$(srcdir)/../libelf -I$(srcdir)/../libebl \ -I$(srcdir)/../libdw -I$(srcdir)/../libdwelf -Wno-format-truncation VERSION = 1 -# Disable eu- prefixing for the binaries in this directory, since they -# do not conflict with binutils tools. +# Disable eu- prefixing for artifacts (binaries & man pages) in this +# directory, since they do not conflict with binutils tools. program_prefix= program_transform_name = s,x,x, @@ -57,9 +57,9 @@ AM_LDFLAGS = -Wl,-rpath-link,../libelf:../libdw:. bin_PROGRAMS = dbgserver dbgserver-find dbgserver_SOURCES = dbgserver.cxx -man8_MANS = dbgserver.8 -man3_MANS = dbgserver_find_debuginfo.3 dbgserver_find_source.3 dbgserver_find_executable.3 -man1_MANS = dbgserver-find.1 +dist_man8_MANS = dbgserver.8 +dist_man3_MANS = dbgserver_find_debuginfo.3 dbgserver_find_source.3 dbgserver_find_executable.3 +dist_man1_MANS = dbgserver-find.1 dbgserver_LDADD = $(libdw) $(libelf) $(libeu) $(libdbgserver) $(libmicrohttpd_LIBS) $(libcurl_LIBS) $(sqlite3_LIBS) $(libarchive_LIBS) -lpthread -ldl dbgserver_find_SOURCES = dbgserver-find.c @@ -98,7 +98,7 @@ uninstall: uninstall-am rm -f $(DESTDIR)$(libdir)/libdbgserver.so rmdir --ignore-fail-on-non-empty $(DESTDIR)$(includedir)/elfutils -EXTRA_DIST = libdbgserver.map dbgserver.8 dbgserver-find.1 dbgserver_find_debuginfo.3 dbgserver_find_source.3 dbgserver_find_executable.3 +EXTRA_DIST = libdbgserver.map MOSTLYCLEANFILES = $(am_libdbgserver_pic_a_OBJECTS) libdbgserver.so.$(VERSION) CLEANFILES += $(am_libdbgserver_pic_a_OBJECTS) libdbgserver.so diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 274571c3..0038ce96 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -109,7 +109,7 @@ libdw_so_LIBS = ../libebl/libebl_pic.a ../backends/libebl_backends_pic.a \ ../libcpu/libcpu_pic.a libdw_pic.a ../libdwelf/libdwelf_pic.a \ ../libdwfl/libdwfl_pic.a libdw_so_DEPS = ../lib/libeu.a ../libelf/libelf.so -libdw_so_LDLIBS = $(libdw_so_DEPS) -lz $(argp_LDADD) $(zip_LIBS) +libdw_so_LDLIBS = $(libdw_so_DEPS) -ldl -lz $(argp_LDADD) $(zip_LIBS) libdw_so_SOURCES = libdw.so$(EXEEXT): $(srcdir)/libdw.map $(libdw_so_LIBS) $(libdw_so_DEPS) $(AM_V_CCLD)$(LINK) $(dso_LDFLAGS) -o $@ \ |