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 /wsutil | |
| 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 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index f8c3f2bfb2..23c171d104 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -18,8 +18,13 @@ # 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.common +include $(top_srcdir)/Makefile.am.inc + ACLOCAL_AMFLAGS = `../aclocal-flags` +AM_CPPFLAGS += $(LIBGCRYPT_CFLAGS) -DWS_BUILD_DLL + # Optional headers for ABI checking wsutil_optional_abi_includes = @@ -47,26 +52,12 @@ if SSE42_SUPPORTED wsutil_optional_objects += libwsutil_sse42.la endif -include ../Makefile.am.inc - -include Makefile.common - -AM_CFLAGS =-DWS_BUILD_DLL - -if HAVE_WARNINGS_AS_ERRORS -AM_CFLAGS += -Werror -endif - noinst_LTLIBRARIES = libwsutil_sse42.la lib_LTLIBRARIES = libwsutil.la # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html libwsutil_la_LDFLAGS = -version-info 0:0:0 @LDFLAGS_SHAREDLIB@ -AM_CPPFLAGS = -I$(srcdir)/.. \ - $(LIBGCRYPT_CFLAGS) \ - -DTOP_SRCDIR=\"$(abs_top_srcdir)\" - LIBWSUTIL_SRC = $(LIBWSUTIL_COMMON_SRC) LIBWSUTIL_INCLUDES = $(LIBWSUTIL_COMMON_INCLUDES) @@ -82,7 +73,7 @@ libwsutil_la_SOURCES = \ libwsutil_sse42_la_SOURCES = \ ws_mempbrk_sse42.c -libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) @CFLAGS_SSE42@ +libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_SSE42) EXTRA_libwsutil_la_SOURCES = \ floorl.c \ |