Create LTLIBOBJS from LIBOBJS and add to libyasm.
authorPeter Johnson <peter@tortall.net>
Mon, 23 Sep 2002 16:25:39 +0000 (16:25 -0000)
committerPeter Johnson <peter@tortall.net>
Mon, 23 Sep 2002 16:25:39 +0000 (16:25 -0000)
Change use of LDADD for libraries to LIBADD (automake warning).

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

Makefile.am
configure.ac
modules/objfmts/bin/Makefile.inc
modules/objfmts/dbg/Makefile.inc
src/objfmts/bin/Makefile.inc
src/objfmts/dbg/Makefile.inc

index 3e835203faeab36d5be74c25161a92e92f61f9da..a0ea11535dd82e16ba2ec86a007e81be8c736a95 100644 (file)
@@ -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
index 8989044a347e9fe006648bdebf3019f7b28423ba..2ae327e069eec8e89c47667443c5269320f6bd11 100644 (file)
@@ -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
index 271a4a8ce365fc2b2f624e8762934f28f7e0ffdd..c8da9eaffbf8b43ef26b90f7840d6dc4383d6aea 100644 (file)
@@ -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 += \
index 502c62924df49af618ca5efa34bd51fb825dc216..d0fa7678d662481f31b81c5c003bebb7ceb3676b 100644 (file)
@@ -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
index 271a4a8ce365fc2b2f624e8762934f28f7e0ffdd..c8da9eaffbf8b43ef26b90f7840d6dc4383d6aea 100644 (file)
@@ -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 += \
index 502c62924df49af618ca5efa34bd51fb825dc216..d0fa7678d662481f31b81c5c003bebb7ceb3676b 100644 (file)
@@ -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