From: Karel Zak Date: Thu, 21 Mar 2013 12:11:09 +0000 (+0100) Subject: build-sys: don't use nested BUILD_* X-Git-Tag: v2.23-rc1~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4770708d5948b4aac9c5291ba69d64711086394;p=thirdparty%2Futil-linux.git build-sys: don't use nested BUILD_* Signed-off-by: Karel Zak --- diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am index 44b471289a..c8194f36a9 100644 --- a/sys-utils/Makemodule.am +++ b/sys-utils/Makemodule.am @@ -34,6 +34,12 @@ usrsbin_exec_PROGRAMS += readprofile dist_man_MANS += sys-utils/readprofile.8 readprofile_SOURCES = sys-utils/readprofile.c +if BUILD_TUNELP +usrsbin_exec_PROGRAMS += tunelp +dist_man_MANS += sys-utils/tunelp.8 +tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h +endif + if LINUX # @@ -73,12 +79,6 @@ dist_man_MANS += sys-utils/ldattach.8 ldattach_SOURCES = sys-utils/ldattach.c ldattach_LDADD = $(LDADD) libcommon.la -if BUILD_TUNELP -usrsbin_exec_PROGRAMS += tunelp -dist_man_MANS += sys-utils/tunelp.8 -tunelp_SOURCES = sys-utils/tunelp.c sys-utils/lp.h -endif - usrsbin_exec_PROGRAMS += rtcwake dist_man_MANS += sys-utils/rtcwake.8 rtcwake_SOURCES = sys-utils/rtcwake.c @@ -153,6 +153,7 @@ dist_man_MANS += sys-utils/losetup.8 losetup_SOURCES = sys-utils/losetup.c losetup_LDADD = $(LDADD) libcommon.la + if HAVE_STATIC_LOSETUP bin_PROGRAMS += losetup.static losetup_static_SOURCES = $(losetup_SOURCES)