diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-03-27 00:32:57 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-04-04 23:58:41 +0000 |
| commit | 7f873d92cb7038247ab578d14d7e4794dcd6d98b (patch) | |
| tree | 1fa9d97f7b1576529242b77aa0a758cd360a6b1a /wsutil/Makefile.am | |
| parent | cd1d1377430aa50fb1363fad7ab9de7026b4f716 (diff) | |
| download | wireshark-7f873d92cb7038247ab578d14d7e4794dcd6d98b.tar.gz | |
Use AC_REPLACE_FUNCS and LTLIBOBJS
Change-Id: I0f46167fe900c39d678560809cd5391c2a9bc4d2
Reviewed-on: https://code.wireshark.org/review/14809
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/Makefile.am')
| -rw-r--r-- | wsutil/Makefile.am | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 434457ccd8..6b8de84d28 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -42,13 +42,7 @@ libwsutil_abi_INCLUDES = \ # Optional objects that I know how to build. These will be # linked into libwsutil if necessary. -wsutil_optional_objects = \ - @GETOPT_LO@ \ - @INET_ATON_LO@ \ - @INET_NTOP_LO@ \ - @INET_PTON_LO@ \ - @POPCOUNT_LO@ \ - @STRPTIME_LO@ +wsutil_optional_objects = if SSE42_SUPPORTED wsutil_optional_objects += libwsutil_sse42.la @@ -78,23 +72,14 @@ libwsutil_sse42_la_SOURCES = \ libwsutil_sse42_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_SSE42) EXTRA_libwsutil_la_SOURCES = \ - inet_aton.c \ - inet_aton.h \ - inet_ntop.c \ - inet_pton.c \ inet_addr-int.h \ - popcount.c \ - popcount.h \ - strptime.c \ - strptime.h \ - wsgetopt.c \ - wsgetopt.h \ - wsgetopt_int.h - -libwsutil_la_DEPENDENCIES = \ + wsgetopt.h + +EXTRA_libwsutil_la_DEPENDENCIES = \ $(wsutil_optional_objects) libwsutil_la_LIBADD = \ + $(LTLIBOBJS) \ @COREFOUNDATION_FRAMEWORKS@ \ @GLIB_LIBS@ \ @LIBGCRYPT_LIBS@ \ |