Move yasm core files into a libyasm shared library (avoiding backlinking).

Some cleanups still needed; a few things in globals should really be somewhere
else, or named differently.

svn path=/trunk/yasm/; revision=705
0.3
Peter Johnson 23 years ago
parent ba294928c6
commit b7a8747102
  1. 8
      Makefile.am
  2. 17
      frontends/yasm/Makefile.inc
  3. 17
      libyasm/Makefile.inc
  4. 28
      libyasm/tests/Makefile.inc
  5. 17
      modules/Makefile.inc
  6. 1
      modules/objfmts/bin/Makefile.inc
  7. 1
      modules/objfmts/dbg/Makefile.inc
  8. 17
      src/Makefile.inc
  9. 1
      src/objfmts/bin/Makefile.inc
  10. 1
      src/objfmts/dbg/Makefile.inc
  11. 28
      src/tests/Makefile.inc

@ -1,6 +1,6 @@
# $IdPath$
SUBDIRS = libltdl m4 po
SUBDIRS = libltdl m4 po .
CFLAGS = @ANSI_CFLAGS@
AM_YFLAGS = -d
@ -15,10 +15,10 @@ TESTS =
noinst_PROGRAMS =
yasm_SOURCES =
yasm_LDFLAGS = -export-dynamic
yasm_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
yasm_LDFLAGS =
yasm_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
lib_LTLIBRARIES =
lib_LTLIBRARIES = libyasm.la
BUILT_SOURCES =
# configure.lineno doesn't clean up after itself?
CLEANFILES = configure.lineno

@ -1,9 +1,11 @@
# $IdPath$
YASMBASEFILES = \
libyasm_la_SOURCES = \
src/bytecode.c \
src/bytecode.h \
src/bc-int.h \
src/errwarn.c \
src/errwarn.h \
src/expr.c \
src/expr.h \
src/expr-int.h \
@ -19,13 +21,10 @@ YASMBASEFILES = \
src/section.h \
src/arch.c \
src/arch.h \
src/objfmt.c \
src/objfmt.h \
src/preproc.c \
src/preproc.h \
src/parser.c \
src/parser.h \
src/optimizer.h \
src/parser.h \
src/preproc.h \
src/intnum.c \
src/intnum.h \
src/floatnum.c \
@ -42,11 +41,11 @@ YASMBASEFILES = \
yasm_SOURCES += \
src/main.c \
src/errwarn.c \
src/errwarn.h \
src/options.c \
src/options.h \
$(YASMBASEFILES)
src/objfmt.c \
src/preproc.c \
src/parser.c
EXTRA_DIST += \

@ -1,9 +1,11 @@
# $IdPath$
YASMBASEFILES = \
libyasm_la_SOURCES = \
src/bytecode.c \
src/bytecode.h \
src/bc-int.h \
src/errwarn.c \
src/errwarn.h \
src/expr.c \
src/expr.h \
src/expr-int.h \
@ -19,13 +21,10 @@ YASMBASEFILES = \
src/section.h \
src/arch.c \
src/arch.h \
src/objfmt.c \
src/objfmt.h \
src/preproc.c \
src/preproc.h \
src/parser.c \
src/parser.h \
src/optimizer.h \
src/parser.h \
src/preproc.h \
src/intnum.c \
src/intnum.h \
src/floatnum.c \
@ -42,11 +41,11 @@ YASMBASEFILES = \
yasm_SOURCES += \
src/main.c \
src/errwarn.c \
src/errwarn.h \
src/options.c \
src/options.h \
$(YASMBASEFILES)
src/objfmt.c \
src/preproc.c \
src/parser.c
EXTRA_DIST += \

@ -10,51 +10,39 @@ noinst_PROGRAMS += \
bitvect_test_SOURCES = \
src/tests/bitvect_test.c \
src/errwarn.c \
$(YASMBASEFILES) \
$(YASMPARSERFILES) \
$(YASMPREPROCFILES) \
$(YASMOPTIMIZERFILES) \
$(YASMOBJFMTFILES) \
$(YASMARCHFILES) \
$(CHECKFILES)
bitvect_test_LDFLAGS = -export-dynamic
bitvect_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
bitvect_test_LDFLAGS =
bitvect_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#bytecode_test_SOURCES = \
# src/tests/bytecode_test.c \
# src/errwarn.c \
# $(YASMBASEFILES) \
# $(YASMPARSERFILES) \
# $(YASMPREPROCFILES) \
# $(YASMOPTIMIZERFILES) \
# $(YASMOBJFMTFILES) \
# $(YASMARCHFILES) \
# $(CHECKFILES)
#bytecode_test_LDFLAGS = -export-dynamic
#bytecode_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#bytecode_test_LDFLAGS =
#bytecode_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
floatnum_test_SOURCES = \
src/tests/floatnum_test.c \
src/errwarn.c \
src/globals.c \
src/hamt.c \
src/bitvect.c \
src/xmalloc.c \
src/xstrdup.c \
$(CHECKFILES)
floatnum_test_LDFLAGS = -export-dynamic
floatnum_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
floatnum_test_LDFLAGS =
floatnum_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#memexpr_test_SOURCES = \
# src/tests/memexpr_test.c \
# src/errwarn.c \
# $(YASMBASEFILES) \
# $(YASMPARSERFILES) \
# $(YASMPREPROCFILES) \
# $(YASMOPTIMIZERFILES) \
# $(YASMOBJFMTFILES) \
# $(YASMARCHFILES) \
# $(CHECKFILES)
#memexpr_test_LDFLAGS = -export-dynamic
#memexpr_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#memexpr_test_LDFLAGS =
#memexpr_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@

@ -1,9 +1,11 @@
# $IdPath$
YASMBASEFILES = \
libyasm_la_SOURCES = \
src/bytecode.c \
src/bytecode.h \
src/bc-int.h \
src/errwarn.c \
src/errwarn.h \
src/expr.c \
src/expr.h \
src/expr-int.h \
@ -19,13 +21,10 @@ YASMBASEFILES = \
src/section.h \
src/arch.c \
src/arch.h \
src/objfmt.c \
src/objfmt.h \
src/preproc.c \
src/preproc.h \
src/parser.c \
src/parser.h \
src/optimizer.h \
src/parser.h \
src/preproc.h \
src/intnum.c \
src/intnum.h \
src/floatnum.c \
@ -42,11 +41,11 @@ YASMBASEFILES = \
yasm_SOURCES += \
src/main.c \
src/errwarn.c \
src/errwarn.h \
src/options.c \
src/options.h \
$(YASMBASEFILES)
src/objfmt.c \
src/preproc.c \
src/parser.c
EXTRA_DIST += \

@ -5,6 +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_LDADD += -dlopen yasm-bin.la
EXTRA_DIST += \

@ -5,4 +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_LDADD += -dlopen yasm-dbg.la

@ -1,9 +1,11 @@
# $IdPath$
YASMBASEFILES = \
libyasm_la_SOURCES = \
src/bytecode.c \
src/bytecode.h \
src/bc-int.h \
src/errwarn.c \
src/errwarn.h \
src/expr.c \
src/expr.h \
src/expr-int.h \
@ -19,13 +21,10 @@ YASMBASEFILES = \
src/section.h \
src/arch.c \
src/arch.h \
src/objfmt.c \
src/objfmt.h \
src/preproc.c \
src/preproc.h \
src/parser.c \
src/parser.h \
src/optimizer.h \
src/parser.h \
src/preproc.h \
src/intnum.c \
src/intnum.h \
src/floatnum.c \
@ -42,11 +41,11 @@ YASMBASEFILES = \
yasm_SOURCES += \
src/main.c \
src/errwarn.c \
src/errwarn.h \
src/options.c \
src/options.h \
$(YASMBASEFILES)
src/objfmt.c \
src/preproc.c \
src/parser.c
EXTRA_DIST += \

@ -5,6 +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_LDADD += -dlopen yasm-bin.la
EXTRA_DIST += \

@ -5,4 +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_LDADD += -dlopen yasm-dbg.la

@ -10,51 +10,39 @@ noinst_PROGRAMS += \
bitvect_test_SOURCES = \
src/tests/bitvect_test.c \
src/errwarn.c \
$(YASMBASEFILES) \
$(YASMPARSERFILES) \
$(YASMPREPROCFILES) \
$(YASMOPTIMIZERFILES) \
$(YASMOBJFMTFILES) \
$(YASMARCHFILES) \
$(CHECKFILES)
bitvect_test_LDFLAGS = -export-dynamic
bitvect_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
bitvect_test_LDFLAGS =
bitvect_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#bytecode_test_SOURCES = \
# src/tests/bytecode_test.c \
# src/errwarn.c \
# $(YASMBASEFILES) \
# $(YASMPARSERFILES) \
# $(YASMPREPROCFILES) \
# $(YASMOPTIMIZERFILES) \
# $(YASMOBJFMTFILES) \
# $(YASMARCHFILES) \
# $(CHECKFILES)
#bytecode_test_LDFLAGS = -export-dynamic
#bytecode_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#bytecode_test_LDFLAGS =
#bytecode_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
floatnum_test_SOURCES = \
src/tests/floatnum_test.c \
src/errwarn.c \
src/globals.c \
src/hamt.c \
src/bitvect.c \
src/xmalloc.c \
src/xstrdup.c \
$(CHECKFILES)
floatnum_test_LDFLAGS = -export-dynamic
floatnum_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
floatnum_test_LDFLAGS =
floatnum_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#memexpr_test_SOURCES = \
# src/tests/memexpr_test.c \
# src/errwarn.c \
# $(YASMBASEFILES) \
# $(YASMPARSERFILES) \
# $(YASMPREPROCFILES) \
# $(YASMOPTIMIZERFILES) \
# $(YASMOBJFMTFILES) \
# $(YASMARCHFILES) \
# $(CHECKFILES)
#memexpr_test_LDFLAGS = -export-dynamic
#memexpr_test_LDADD = @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@
#memexpr_test_LDFLAGS =
#memexpr_test_LDADD = libyasm.la @LIBLTDL@ @LIBOBJS@ $(INTLLIBS) @LIBADD_DL@

Loading…
Cancel
Save