Create LTLIBOBJS from LIBOBJS and add to libyasm.

Change use of LDADD for libraries to LIBADD (automake warning).

svn path=/trunk/yasm/; revision=706

Makefile.am

@@ -16,9 +16,11 @@ noinst_PROGRAMS =
 
 yasm_SOURCES =
 yasm_LDFLAGS =
-yasm_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
+yasm_LDADD = libyasm.la @LIBLTDL@ $(INTLLIBS) @LIBADD_DL@
 
 lib_LTLIBRARIES = libyasm.la
+libyasm_la_LIBADD = @LTLIBOBJS@
+
 BUILT_SOURCES =
 # configure.lineno doesn't clean up after itself?
 CLEANFILES = configure.lineno

configure.ac

@@ -283,6 +283,12 @@ esac
 AC_SUBST(INCLTDL)
 AC_SUBST(LIBLTDL)
 
+# Create LTLIBOBJS
+Xsed="sed -e s/^X//"
+LTLIBOBJS=`echo X"$LIB@&t@OBJS"|\
+	[$Xsed -e 's,\.[^.]* ,.lo ,g;s,\.[^.]*$,.lo,']`
+AC_SUBST(LTLIBOBJS)
+
 AC_CONFIG_FILES([Makefile
 	libltdl/Makefile
 	m4/Makefile

modules/objfmts/bin/Makefile.inc

@@ -5,7 +5,7 @@ lib_LTLIBRARIES += yasm-bin.la
 yasm_bin_la_SOURCES = \
 	src/objfmts/bin/bin-objfmt.c
 yasm_bin_la_LDFLAGS = -module
-yasm_bin_la_LDADD = libyasm.la
+yasm_bin_la_LIBADD = libyasm.la
 yasm_LDADD += -dlopen yasm-bin.la
 
 EXTRA_DIST += \

modules/objfmts/dbg/Makefile.inc

@@ -5,5 +5,5 @@ lib_LTLIBRARIES += yasm-dbg.la
 yasm_dbg_la_SOURCES = \
 	src/objfmts/dbg/dbg-objfmt.c
 yasm_dbg_la_LDFLAGS = -module
-yasm_dbg_la_LDADD = libyasm.la
+yasm_dbg_la_LIBADD = libyasm.la
 yasm_LDADD += -dlopen yasm-dbg.la

src/objfmts/bin/Makefile.inc

@@ -5,7 +5,7 @@ lib_LTLIBRARIES += yasm-bin.la
 yasm_bin_la_SOURCES = \
 	src/objfmts/bin/bin-objfmt.c
 yasm_bin_la_LDFLAGS = -module
-yasm_bin_la_LDADD = libyasm.la
+yasm_bin_la_LIBADD = libyasm.la
 yasm_LDADD += -dlopen yasm-bin.la
 
 EXTRA_DIST += \

src/objfmts/dbg/Makefile.inc

@@ -5,5 +5,5 @@ lib_LTLIBRARIES += yasm-dbg.la
 yasm_dbg_la_SOURCES = \
 	src/objfmts/dbg/dbg-objfmt.c
 yasm_dbg_la_LDFLAGS = -module
-yasm_dbg_la_LDADD = libyasm.la
+yasm_dbg_la_LIBADD = libyasm.la
 yasm_LDADD += -dlopen yasm-dbg.la