build-sys: avoid using prog_DEPENDENCIES

Use EXTRA_prog_DEPENDENCIES to have the benefit
of automake's automatic prog_DEPENDENCIES.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am
index 2bd19959f71ab7a9e417b7a641085821cf50fa27..807cc21ee947763194c08af643c4745197675b30 100644 (file)
--- a/libblkid/src/Makemodule.am
+++ b/libblkid/src/Makemodule.am
@@ -113,8 +113,7 @@ endif
 
 libblkid_la_LIBADD = libcommon.la
 
-libblkid_la_DEPENDENCIES = \
-       libcommon.la \
+EXTRA_libblkid_la_DEPENDENCIES = \
        libblkid/src/libblkid.sym
 
 libblkid_la_CFLAGS = \
@@ -125,7 +124,6 @@ libblkid_la_CFLAGS = \
 
 if BUILD_LIBUUID
 libblkid_la_LIBADD += libuuid.la
-libblkid_la_DEPENDENCIES += libuuid.la
 libblkid_la_CFLAGS += -I$(ul_libuuid_incdir)
 endif
 

diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am
index 73bc89a954a427fbe2570ed1786d48bc852998a2..77eed0bfbb506a6f6c294ab5e32e6f933d30fd64 100644 (file)
--- a/libfdisk/src/Makemodule.am
+++ b/libfdisk/src/Makemodule.am
@@ -40,9 +40,7 @@ libfdisk_la_CFLAGS = \
        -I$(ul_libfdisk_incdir) \
        -I$(top_srcdir)/libfdisk/src
 
-libfdisk_la_DEPENDENCIES = \
-       libcommon.la \
-       libuuid.la \
+EXTRA_libfdisk_la_DEPENDENCIES = \
        libfdisk/src/libfdisk.sym
 
 libfdisk_la_LDFLAGS = $(SOLIB_LDFLAGS)
@@ -54,7 +52,6 @@ libfdisk_la_LDFLAGS += -version-info $(LIBFDISK_VERSION_INFO)
 
 if BUILD_LIBBLKID
 libfdisk_la_LIBADD += libblkid.la
-libfdisk_la_DEPENDENCIES += libblkid.la
 libfdisk_la_CFLAGS += -I$(ul_libblkid_incdir)
 endif
 

diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am
index 1a6a8374ab177904005b59c41c41712947b0715a..8d743325573096e1cf968058545656ad75bfc89c 100644 (file)
--- a/libmount/src/Makemodule.am
+++ b/libmount/src/Makemodule.am
@@ -52,9 +52,7 @@ libmount_la_CFLAGS = \
        -I$(ul_libmount_incdir) \
        -I$(top_srcdir)/libmount/src
 
-libmount_la_DEPENDENCIES = \
-       libcommon.la \
-       libblkid.la \
+EXTRA_libmount_la_DEPENDENCIES = \
        libmount/src/libmount.sym
 
 libmount_la_LDFLAGS = $(SOLIB_LDFLAGS)

diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
index 6f5f6072cf40bec29d0b85730a494d0852cb0a5e..175f9f2064c91ba0e432877d968eae5f993b60c8 100644 (file)
--- a/libsmartcols/src/Makemodule.am
+++ b/libsmartcols/src/Makemodule.am
@@ -27,8 +27,7 @@ libsmartcols_la_CFLAGS = \
        -I$(ul_libsmartcols_incdir) \
        -I$(top_srcdir)/libsmartcols/src
 
-libsmartcols_la_DEPENDENCIES = \
-       libcommon.la \
+EXTRA_libsmartcols_la_DEPENDENCIES = \
        libsmartcols/src/libsmartcols.sym
 
 libsmartcols_la_LDFLAGS = $(SOLIB_LDFLAGS)

diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
index a1c1e4ab35382049bca39293775db76b1d1c4cdb..5122622a5a44ae09096f130e203f2d7ddec7b07b 100644 (file)
--- a/libuuid/src/Makemodule.am
+++ b/libuuid/src/Makemodule.am
@@ -28,7 +28,9 @@ libuuid_la_SOURCES = \
        lib/md5.c \
        lib/sha1.c
 
-libuuid_la_DEPENDENCIES = libuuid/src/libuuid.sym
+EXTRA_libuuid_la_DEPENDENCIES = \
+       libuuid/src/libuuid.sym
+
 libuuid_la_LIBADD       = $(SOCKET_LIBS)
 
 libuuid_la_CFLAGS = \