aboutsummaryrefslogtreecommitdiffstats
path: root/echld/Makefile.am
AgeCommit message (Collapse)AuthorFilesLines
2016-03-23Add pkg.m4 and remove aclocal-flags scriptJoão Valverde1-2/+0
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>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-1/+2
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-14/+3
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2015-01-22Get us building with the subdir-objects automake option.Jeff Morriss1-2/+1
subdir-objects will be enabled unconditionally in automake-2.0 and automake-1.14 gives us warnings about the upcoming change. Rework I1b3c517f08d3c752ee03cb89482ee4951ceb5bf3 (and I416f2d3611fb61659b9a7f7285e5f54a354fbe7d) to give wslua/make-reg.pl the directory of the source files rather than the full path to each. In echld don't use sources in the top-level directory in libechld: it breaks distclean with subdir-objects turned on. Bug: 10648 Change-Id: I404b074f1558376064c35d8fc96aea7e3d042a76 Reviewed-on: https://code.wireshark.org/review/6697 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-31Add a bunch of missing files to the distribution.Guy Harris1-1/+2
Files from the debian directory, documents from the doc directory, graphics from the docbook/wsug_graphics directory, and the echld Makefile.nmake. Change-Id: Iccccc58811753581b0b180053defd937aea22f95 Reviewed-on: https://code.wireshark.org/review/3283 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-04Move utility routines for capturing into a libcaputils static library.Guy Harris1-0/+2
Some of those routines are used only in dumpcap; others are used in TShark and Wireshark as well. Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7 Reviewed-on: https://code.wireshark.org/review/2841 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-10-27More SVN properties cleanup.Jeff Morriss1-1/+1
svn path=/trunk/; revision=52884
2013-07-21- Whitespace changesJörg Mayer1-11/+11
- Add a missing continuation \ svn path=/trunk/; revision=50770
2013-06-27MS: list interfaces!Luis Ontanon1-2/+6
svn path=/trunk/; revision=50195
2013-06-25Last changes to autofoo, rename the files as they live now in their own dir...Luis Ontanon1-0/+3
svn path=/trunk/; revision=50152
2013-06-25remove the Makefile.nmake target to avoid errors in dist...Luis Ontanon1-2/+1
svn path=/trunk/; revision=50142
2013-06-25another iteration, prepared for automake.Luis Ontanon1-41/+14
svn path=/trunk/; revision=50136
2013-06-25more stuff...Luis Ontanon1-0/+12
svn path=/trunk/; revision=50135
2013-06-22Not yet running but almost there with the dummyLuis Ontanon1-0/+86
svn path=/trunk/; revision=50114