diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index a794c80..c08a7a8 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -10,8 +10,7 @@ AM_CPPFLAGS =						\
 	-DREGDATADIR="\"$(datadir)/liblangtag\""	\
 	$(LIBXML2_CFLAGS)				\
 	$(NULL)
-LIBS =							\
-	@LDFLAGS@					\
+LDADD =							\
 	$(LIBXML2_LIBS)					\
 	$(NULL)
 EXTRA_DIST =					\
@@ -46,7 +45,7 @@ if ENABLE_MODULE
 module_LTLIBRARIES += $(modules)
 module_t_cflags =
 module_u_cflags =
-LIBS += $(top_builddir)/liblangtag/liblangtag.la
+LDADD += $(top_builddir)/liblangtag/liblangtag.la
 else
 noinst_LTLIBRARIES += $(modules)
 module_t_cflags = -DLT_MODULE_PREFIX=lt_module_ext_t
diff --git a/liblangtag-gobject/Makefile.am b/liblangtag-gobject/Makefile.am
index 74e8058..8386885 100644
--- a/liblangtag-gobject/Makefile.am
+++ b/liblangtag-gobject/Makefile.am
@@ -14,14 +14,6 @@ AM_CPPFLAGS =					\
 if ENABLE_DEBUG
 CFLAGS += -Wno-error=cpp -Wcpp
 endif
-DEPS =							\
-	$(top_builddir)/liblangtag/liblangtag.la	\
-	$(NULL)
-LIBS =							\
-	@LDFLAGS@					\
-	$(GOBJECT_LIBS)					\
-	$(top_builddir)/liblangtag/liblangtag.la	\
-	$(NULL)
 EXTRA_DIST =						\
 	gengir.sh					\
 	gendeps.sh					\
@@ -151,6 +143,10 @@ liblangtag_gobject_la_SOURCES =				\
 liblangtag_gobject_la_CFLAGS =				\
 	-DG_LOG_DOMAIN="\"LangTag-GObject\""		\
 	$(NULL)
+liblangtag_gobject_la_LIBADD =				\
+	$(GOBJECT_LIBS)					\
+	$(top_builddir)/liblangtag/liblangtag.la	\
+	$(NULL)
 liblangtag_gobject_la_LDFLAGS =						\
 	$(LDFLAGS)							\
 	-version-info $(LT_G_CURRENT):$(LT_G_REVISION):$(LT_G_AGE)	\
diff --git a/liblangtag/Makefile.am b/liblangtag/Makefile.am
index d20daa5..336c725 100644
--- a/liblangtag/Makefile.am
+++ b/liblangtag/Makefile.am
@@ -16,11 +16,6 @@ AM_CPPFLAGS =							\
 	$(LIBXML2_CFLAGS)					\
 	$(PTHREAD_CFLAGS)					\
 	$(NULL)
-LIBS =						\
-	@LDFLAGS@				\
-	$(LIBXML2_LIBS)				\
-	$(PTHREAD_LIBS)				\
-	$(NULL)
 EXTRA_DIST =					\
 	buildaliastbl.sh			\
 	$(NULL)
@@ -204,9 +199,10 @@ liblangtag_la_CFLAGS =				\
 	-DG_LOG_DOMAIN="\"LangTag\""		\
 	$(NULL)
 liblangtag_la_LIBADD =						\
-	$(LIBS)							\
+	$(LIBXML2_LIBS)						\
+	$(PTHREAD_LIBS)						\
 	$(included_modules)					\
-	@MODULE_LIBS@ 							\
+	$(MODULE_LIBS) 						\
 	$(NULL)
 liblangtag_la_DEPENDENCIES =					\
 	$(included_modules)					\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 049ebf1..47e3128 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -11,11 +11,7 @@ AM_CPPFLAGS =								\
 	-D__LANGTAG_PRIVATE						\
 	$(CHECK_CFLAGS)							\
 	$(NULL)
-DEPS =							\
-	$(top_builddir)/liblangtag/liblangtag.la	\
-	$(NULL)
-LIBS =							\
-	@LDFLAGS@					\
+LDADD =							\
 	$(top_builddir)/liblangtag/liblangtag.la	\
 	$(CHECK_LIBS)					\
 	$(NULL)