diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-27 02:28:17 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-01-28 18:13:48 +0000 |
| commit | 265a41e14da6b3ebf1e49e726eee62d1372110bf (patch) | |
| tree | f1a524f8e66ebd43691de84649f231f32ee125f6 /echld | |
| parent | 97a1a50e200a6c50e0014dde7e8ec932c30190a1 (diff) | |
autotools: Don't use "user variables" to set build flags
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>
Diffstat (limited to 'echld')
| -rw-r--r-- | echld/Makefile.am | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/echld/Makefile.am b/echld/Makefile.am index 1bf4a3a544..f92173e58d 100644 --- a/echld/Makefile.am +++ b/echld/Makefile.am @@ -18,36 +18,25 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -include ../Makefile.am.inc +include Makefile.common +include $(top_srcdir)/Makefile.am.inc ACLOCAL_AMFLAGS = `../aclocal-flags` -include Makefile.common +AM_CPPFLAGS += -I$(top_srcdir)/wiretap -DWS_BUILD_DLL # Optional objects that I know how to build. These will be # linked into libechld. echld_optional_objects = $(LIBECHLD_SRC) - lib_LTLIBRARIES = libechld.la libechld_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ - - -AM_CFLAGS =-DWS_BUILD_DLL - -if HAVE_WARNINGS_AS_ERRORS -AM_CFLAGS += -Werror -endif - -AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../wiretap - libechld_la_SOURCES = \ $(LIBECHLD_SRC) \ $(LIBECHLD_INCLUDES) - libechld_la_DEPENDENCIES = \ ../caputils/libcaputils.a \ ../epan/libwireshark.la \ |