diff options
| author | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-04-06 15:31:27 -0700 |
|---|---|---|
| committer | Vladimir Mezentsev <vladimir.mezentsev@oracle.com> | 2022-04-08 09:05:37 -0700 |
| commit | c10622fef4660111a53f4ccbd7b336dbdd7971ab (patch) | |
| tree | 0c0c8deaaac35f40714cd9fbf5a8726b35b6a374 /gprofng/src/Makefile.am | |
| parent | 6849c6a2b8f4588a30eaf83a58a3d2c38c6cae60 (diff) | |
| download | binutils-c10622fef4660111a53f4ccbd7b336dbdd7971ab.zip binutils-c10622fef4660111a53f4ccbd7b336dbdd7971ab.tar.gz binutils-c10622fef4660111a53f4ccbd7b336dbdd7971ab.tar.bz2 | |
gprofng: zlib handling
gprofng/ChangeLog
2022-04-06 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
* configure.ac: Add AM_ZLIB.
* src/Makefile.am: Add $(ZLIBINC) and $(ZLIB).
* gprofng/src/DbeSession.h: Likewise.
* configure: Regenerate.
* Makefile.in: Regenerate.
* doc/Makefile.in: Regenerate.
* gp-display-html/Makefile.in: Regenerate.
* src/Makefile.in: Regenerate.
Diffstat (limited to 'gprofng/src/Makefile.am')
| -rw-r--r-- | gprofng/src/Makefile.am | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 4c5a836..47fd8c9 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -98,10 +98,16 @@ CSOURCES = \ LIBGPROFNG = libgprofng.la +# This is where we get zlib from. zlibdir is -L../zlib and zlibinc is +# -I../zlib, unless we were configured with --with-system-zlib, in which +# case both are empty. +ZLIB = @zlibdir@ -lz +ZLIBINC = @zlibinc@ + AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"@localedir@\" -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ - -I../../bfd -I$(srcdir)/../../bfd + -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ $(GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS) \ $(GPROFNG_NO_SWITCH_CFLAGS) @@ -133,19 +139,19 @@ dbe_DATA = $(srcdir)/gprofng.rc bin_PROGRAMS = gp-archive gp-collect-app gprofng gp-display-text gp-display-src gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc -gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc -gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_SOURCES = gprofng.cc -gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_src_SOURCES = gp-display-src.cc -gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc -gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) +gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) if BUILD_MAN |