diff options
| author | Karel Zak | 2014-03-05 10:20:10 +0100 |
|---|---|---|
| committer | Karel Zak | 2014-03-05 10:20:10 +0100 |
| commit | dbf7043ea1d090d283cfd36280bb14189d8e35b1 (patch) | |
| tree | e4e596f3dc9677fec928c3d526d064d7d7824da8 | |
| parent | Merge branch 'master' of https://github.com/rudimeier/util-linux (diff) | |
| download | kernel-qcow2-util-linux-dbf7043ea1d090d283cfd36280bb14189d8e35b1.tar.gz kernel-qcow2-util-linux-dbf7043ea1d090d283cfd36280bb14189d8e35b1.tar.xz kernel-qcow2-util-linux-dbf7043ea1d090d283cfd36280bb14189d8e35b1.zip | |
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>
| -rw-r--r-- | libblkid/src/Makemodule.am | 11 | ||||
| -rw-r--r-- | libfdisk/src/Makemodule.am | 6 | ||||
| -rw-r--r-- | libmount/src/Makemodule.am | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index a335db4ee..dc4aaa472 100644 --- 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 be5d964d0..b174b784e 100644 --- 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 8ef07e551..5f958d5e9 100644 --- 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 |