Permalink
Browse files

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>
  • Loading branch information...
karelzak committed Mar 5, 2014
1 parent 013efbf commit dbf7043ea1d090d283cfd36280bb14189d8e35b1
Showing with 10 additions and 10 deletions.
  1. +5 −6 libblkid/src/Makemodule.am
  2. +3 −3 libfdisk/src/Makemodule.am
  3. +2 −1 libmount/src/Makemodule.am
View
@@ -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 \
@@ -28,24 +28,24 @@ 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) \
-I$(top_srcdir)/libfdisk/src
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
@@ -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

0 comments on commit dbf7043

Please sign in to comment.