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 /libfdisk | |
| 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>
Diffstat (limited to 'libfdisk')
| -rw-r--r-- | libfdisk/src/Makemodule.am | 6 |
1 files changed, 3 insertions, 3 deletions
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 |