From 8cc66cf51bdbf50e3476b58106627afc7adc1300 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 25 Jul 2019 22:07:32 +0200 Subject: cleanup: remove unneccessary conditionals from automake files If some library isn't present, the variable $(FOO_LIBS) simply evaluates to empty string, so it can be simply be added to LDADD without any checks. Signed-off-by: David Oberhollenzer --- mkfs/Makemodule.am | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'mkfs') diff --git a/mkfs/Makemodule.am b/mkfs/Makemodule.am index 07ea6b6..f8e3e2c 100644 --- a/mkfs/Makemodule.am +++ b/mkfs/Makemodule.am @@ -1,26 +1,8 @@ gensquashfs_SOURCES = mkfs/mkfs.c mkfs/mkfs.h mkfs/options.c gensquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a gensquashfs_CPPFLAGS = $(AM_CPPFLAGS) - -if WITH_XZ -gensquashfs_LDADD += $(XZ_LIBS) -endif - -if WITH_GZIP -gensquashfs_LDADD += $(ZLIB_LIBS) -endif - -if WITH_LZO -gensquashfs_LDADD += $(LZO_LIBS) -endif - -if WITH_LZ4 -gensquashfs_LDADD += $(LZ4_LIBS) -endif - -if WITH_ZSTD +gensquashfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) gensquashfs_LDADD += $(ZSTD_LIBS) -endif if WITH_SELINUX gensquashfs_CPPFLAGS += -DWITH_SELINUX -- cgit v1.2.3