From a01bbcfc192d4c524147ef6da7f560bd06dd98da Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 14 Sep 2018 13:40:21 +0200 Subject: [PATCH] build: Split noinst_PROGRAMS and libexec_PROGRAMS statements --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7e2a70b8..de1dffb0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,8 +69,10 @@ ell_sources = ell/ell.h ell/private.h ell/missing.h \ ell_libell_internal_la_SOURCES = $(ell_sources) bin_PROGRAMS = +libexec_PROGRAMS = +noinst_PROGRAMS = -libexec_PROGRAMS = src/iwd +libexec_PROGRAMS += src/iwd src_iwd_SOURCES = src/main.c linux/nl80211.h \ src/netdev.h src/netdev.c \ @@ -114,9 +116,7 @@ src_iwd_SOURCES = src/main.c linux/nl80211.h \ src/adhoc.h src/adhoc.c \ src/sae.h src/sae.c \ $(builtin_sources) - src_iwd_LDADD = ell/libell-internal.la -ldl - src_iwd_DEPENDENCIES = ell/libell-internal.la if SYSTEMD_SERVICE @@ -169,7 +169,7 @@ monitor_iwmon_SOURCES = monitor/main.c linux/nl80211.h \ monitor_iwmon_LDADD = ell/libell-internal.la endif -noinst_PROGRAMS = tools/hwsim tools/test-runner +noinst_PROGRAMS += tools/hwsim tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \ src/util.h src/util.c \ @@ -177,6 +177,8 @@ tools_hwsim_SOURCES = tools/hwsim.c src/mpdu.h \ src/common.h src/common.c tools_hwsim_LDADD = ell/libell-internal.la +noinst_PROGRAMS += tools/test-runner + tools_test_runner_SOURCES = tools/test-runner.c tools_test_runner_LDADD = ell/libell-internal.la