From 8cc66cf51bdbf50e3476b58106627afc7adc1300 Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
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 <david.oberhollenzer@sigma-star.at>
---
 mkfs/Makemodule.am   | 20 +-------------------
 unpack/Makemodule.am | 21 +--------------------
 2 files changed, 2 insertions(+), 39 deletions(-)

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
diff --git a/unpack/Makemodule.am b/unpack/Makemodule.am
index 728f834..b958851 100644
--- a/unpack/Makemodule.am
+++ b/unpack/Makemodule.am
@@ -2,25 +2,6 @@ rdsquashfs_SOURCES = unpack/rdsquashfs.c unpack/rdsquashfs.h
 rdsquashfs_SOURCES += unpack/list_files.c unpack/options.c
 rdsquashfs_SOURCES += unpack/restore_fstree.c unpack/describe.c
 rdsquashfs_LDADD = libsquashfs.a libfstree.a libcompress.a libutil.a
-
-if WITH_XZ
-rdsquashfs_LDADD += $(XZ_LIBS)
-endif
-
-if WITH_GZIP
-rdsquashfs_LDADD += $(ZLIB_LIBS)
-endif
-
-if WITH_LZO
-rdsquashfs_LDADD += $(LZO_LIBS)
-endif
-
-if WITH_LZ4
-rdsquashfs_LDADD += $(LZ4_LIBS)
-endif
-
-if WITH_ZSTD
-rdsquashfs_LDADD += $(ZSTD_LIBS)
-endif
+rdsquashfs_LDADD += $(XZ_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(LZ4_LIBS) $(ZSTD_LIBS)
 
 bin_PROGRAMS += rdsquashfs
-- 
cgit v1.2.3