BUILD: Put libs into xoreos_LDADD instead of AM_LDFLAGS

This should preserve the correct linking order for statically linking, i.e. put the all external libraries after our internal convenience libraries.
xoreos · Apr 25, 2014 · 7ae4bae · 7ae4bae
1 parent fd049bf
commit 7ae4bae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Makefile.common b/Makefile.common
@@ -25,6 +25,6 @@ FLAGS_CXX   = -Wnon-virtual-dtor
 
 AM_CFLAGS   = $(FLAGS_C_CXX) $(FLAGS_C)   $(LIBSF_C_CXX) $(LIBSF_C)
 AM_CXXFLAGS = $(FLAGS_C_CXX) $(FLAGS_CXX) $(LIBSF_C_CXX) $(LIBSF_CXX)
-AM_LDFLAGS  = $(LIBSL)
+LDADD       = $(LIBSL)
 
 LIBS =
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -30,4 +30,5 @@ xoreos_LDADD = \
                aurora/libaurora.la \
                common/libcommon.la \
                ../lua/liblua.la \
+               $(LDADD) \
                $(EMPTY)