build-sys: don't connect _DEPENDENCIES and _LIBADD

The _DEPENDENCIES has to be used for dependencies on another in-tree
files, but _LIBADD is to specify additional libs (including external
libs).

Reported-by: oleid <notifications@github.com>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index a335db4ee2d1c72ec3ae50a3139ba32f936480e6..dc4aaa472dc597a1f09290ba4f32b4e0c676d52e 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -110,6 +110,10 @@ endif
 nodist_libblkid_la_SOURCES = libblkid/src/blkid.h
 libblkid_la_LIBADD = libcommon.la
 
+libblkid_la_DEPENDENCIES = \
+       libcommon.la \
+       libblkid/src/blkid.sym \
+       libblkid/src/blkid.h.in
 
 libblkid_la_CFLAGS = \
        $(SOLIB_CFLAGS) \
@@ -118,15 +122,10 @@ libblkid_la_CFLAGS = \
 
 if BUILD_LIBUUID
 libblkid_la_LIBADD += libuuid.la
+libblkid_la_DEPENDENCIES += libuuid.la
 libblkid_la_CFLAGS += -I$(ul_libuuid_incdir)
 endif
 
-
-libblkid_la_DEPENDENCIES = \
-       $(libblkid_la_LIBADD) \
-       libblkid/src/blkid.sym \
-       libblkid/src/blkid.h.in
-
 libblkid_la_LDFLAGS = \
        $(SOLIB_LDFLAGS) \
        -Wl,--version-script=$(top_srcdir)/libblkid/src/blkid.sym \

diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index be5d964d073d8778da7ca75bbf9fc3584acab69c..b174b784e7ffd4eba57a2992ce8edbb51eac3820 100644 (file)
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -28,6 +28,7 @@ libfdisk_la_SOURCES = \
 nodist_libfdisk_la_SOURCES = libfdisk/src/fdiskP.h
 
 libfdisk_la_LIBADD = libcommon.la
+libfdisk_la_DEPENDENCIES = libcommon.la
 
 libfdisk_la_CFLAGS = \
        -I$(ul_libfdisk_incdir) \
@@ -35,17 +36,16 @@ libfdisk_la_CFLAGS = \
 
 if BUILD_LIBBLKID
 libfdisk_la_LIBADD += libblkid.la
+libfdisk_la_DEPENDENCIES += libblkid.la
 libfdisk_la_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 
 if BUILD_LIBUUID
 libfdisk_la_LIBADD += libuuid.la
+libfdisk_la_DEPENDENCIES += libuuid.la
 libfdisk_la_CFLAGS += -I$(ul_libuuid_incdir)
 endif
 
-libfdisk_la_DEPENDENCIES = $(libfdisk_la_LIBADD)
-
-
 check_PROGRAMS += \
        test_fdisk_ask \
        test_fdisk_utils

diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 8ef07e5519b469990e8e6286281d05667bc38af9..5f958d5e914f277600bd771006152d920a6a3353 100644 (file)
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -39,7 +39,8 @@ libmount_la_CFLAGS = \
        -I$(top_srcdir)/libmount/src
 
 libmount_la_DEPENDENCIES = \
-       $(libmount_la_LIBADD) \
+       libcommon.la \
+       libblkid.la \
        libmount/src/libmount.sym \
        libmount/src/libmount.h.in