diff options
| -rw-r--r-- | libblkid/src/Makemodule.am | 7 | ||||
| -rw-r--r-- | libfdisk/src/Makemodule.am | 8 | ||||
| -rw-r--r-- | libmount/src/Makemodule.am | 8 | ||||
| -rw-r--r-- | libsmartcols/src/Makemodule.am | 7 | ||||
| -rw-r--r-- | libuuid/src/Makemodule.am | 8 |
5 files changed, 18 insertions, 20 deletions
diff --git a/libblkid/src/Makemodule.am b/libblkid/src/Makemodule.am index 7d992f5c4..7839813ea 100644 --- a/libblkid/src/Makemodule.am +++ b/libblkid/src/Makemodule.am @@ -128,12 +128,11 @@ libblkid_la_DEPENDENCIES += libuuid.la libblkid_la_CFLAGS += -I$(ul_libuuid_incdir) endif -libblkid_la_LDFLAGS = \ - $(SOLIB_LDFLAGS) \ +libblkid_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT - $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym \ +libblkid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libblkid/src/libblkid.sym endif - -version-info $(LIBBLKID_VERSION_INFO) +libblkid_la_LDFLAGS += -version-info $(LIBBLKID_VERSION_INFO) EXTRA_DIST += \ libblkid/src/libblkid.sym \ diff --git a/libfdisk/src/Makemodule.am b/libfdisk/src/Makemodule.am index fddf6d990..3516d1251 100644 --- a/libfdisk/src/Makemodule.am +++ b/libfdisk/src/Makemodule.am @@ -47,12 +47,12 @@ libfdisk_la_DEPENDENCIES = \ libfdisk/src/libfdisk.sym \ libfdisk/src/libfdisk.h.in -libfdisk_la_LDFLAGS = \ - $(SOLIB_LDFLAGS) \ +libfdisk_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT - $(VSCRIPT_LDFLAGS),$(top_srcdir)/libfdisk/src/libfdisk.sym \ +libfdisk_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libfdisk/src/libfdisk.sym endif - -version-info $(LIBFDISK_VERSION_INFO) +libfdisk_la_LDFLAGS += -version-info $(LIBFDISK_VERSION_INFO) + if BUILD_LIBBLKID libfdisk_la_LIBADD += libblkid.la diff --git a/libmount/src/Makemodule.am b/libmount/src/Makemodule.am index b07a931d4..40a05c633 100644 --- a/libmount/src/Makemodule.am +++ b/libmount/src/Makemodule.am @@ -60,12 +60,12 @@ libmount_la_DEPENDENCIES = \ libmount/src/libmount.sym \ libmount/src/libmount.h.in -libmount_la_LDFLAGS = \ - $(SOLIB_LDFLAGS) \ +libmount_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT - $(VSCRIPT_LDFLAGS),$(top_srcdir)/libmount/src/libmount.sym \ +libmount_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libmount/src/libmount.sym endif - -version-info $(LIBMOUNT_VERSION_INFO) +libmount_la_LDFLAGS += -version-info $(LIBMOUNT_VERSION_INFO) + EXTRA_DIST += \ libmount/src/libmount.sym \ diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am index 248faa9e0..3f814d280 100644 --- a/libsmartcols/src/Makemodule.am +++ b/libsmartcols/src/Makemodule.am @@ -35,12 +35,11 @@ libsmartcols_la_DEPENDENCIES = \ libsmartcols/src/libsmartcols.sym \ libsmartcols/src/libsmartcols.h.in -libsmartcols_la_LDFLAGS = \ - $(SOLIB_LDFLAGS) \ +libsmartcols_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT - $(VSCRIPT_LDFLAGS),$(top_srcdir)/libsmartcols/src/libsmartcols.sym \ +libsmartcols_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libsmartcols/src/libsmartcols.sym endif - -version-info $(LIBSMARTCOLS_VERSION_INFO) +libsmartcols_la_LDFLAGS += -version-info $(LIBSMARTCOLS_VERSION_INFO) EXTRA_DIST += \ libsmartcols/src/libsmartcols.sym \ diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am index f2f66ba5c..2e17677cc 100644 --- a/libuuid/src/Makemodule.am +++ b/libuuid/src/Makemodule.am @@ -36,12 +36,12 @@ libuuid_la_CFLAGS = \ -I$(ul_libuuid_incdir) \ -Ilibuuid/src -libuuid_la_LDFLAGS = \ - $(SOLIB_LDFLAGS) \ +libuuid_la_LDFLAGS = $(SOLIB_LDFLAGS) if HAVE_VSCRIPT - libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym \ +libuuid_la_LDFLAGS += libuuid_la_LDFLAGS += $(VSCRIPT_LDFLAGS),$(top_srcdir)/libuuid/src/libuuid.sym endif - -version-info $(LIBUUID_VERSION_INFO) +libuuid_la_LDFLAGS += -version-info $(LIBUUID_VERSION_INFO) + EXTRA_DIST += libuuid/src/libuuid.sym |