diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-22 22:33:37 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-03-23 02:33:43 +0000 |
| commit | c57b3777f814f4f4108abcf111ee873acb60a91c (patch) | |
| tree | 635ad83b4cd42f8eec27bdbb0fd303cb38813c2d /wsutil | |
| parent | 125989780ba8e658ad0d1f1c71ec01e6d36a2266 (diff) | |
| download | wireshark-c57b3777f814f4f4108abcf111ee873acb60a91c.tar.gz wireshark-c57b3777f814f4f4108abcf111ee873acb60a91c.tar.bz2 wireshark-c57b3777f814f4f4108abcf111ee873acb60a91c.zip | |
Add pkg.m4 and remove aclocal-flags script
Add pkg-config 0.29.1 macros to our distribution. This makes the
aclocal-flags script obsolete, since we are already not using GLib
autoconf macros.
ACLOCAL_AMFLAGS need only be defined on the top-level Makefile.am.
Change-Id: Idd868dcfeb8f279517970d0f96d9d53e3a7e4d5c
Reviewed-on: https://code.wireshark.org/review/14568
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 3e12fa43fb..c69b9bc3c6 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -21,8 +21,6 @@ include Makefile.common include $(top_srcdir)/Makefile.am.inc -ACLOCAL_AMFLAGS = `../aclocal-flags` - AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) -DWS_BUILD_DLL \ -DTOP_SRCDIR=\"$(abs_top_srcdir)\" \ -DDATAFILE_DIR=\"$(pkgdatadir)\" \ |