Minor cleanups (no functional changes) after src split.

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

Makefile.am

@@ -9,17 +9,13 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/check \
 	@INCLTDL@
 
-bin_PROGRAMS = yasm
+bin_PROGRAMS =
 TESTS =
 noinst_PROGRAMS =
 
-yasm_SOURCES =
-yasm_LDFLAGS =
-yasm_LDADD = libyasm.la @LIBLTDL@ $(INTLLIBS) @LIBADD_DL@
-EXTRA_yasm_SOURCES =
+lib_LTLIBRARIES =
 
-lib_LTLIBRARIES = libyasm.la
-libyasm_la_LIBADD = @LTLIBOBJS@
+YASM_MODULES = 
 
 BUILT_SOURCES =
 # configure.lineno doesn't clean up after itself?

frontends/yasm/Makefile.inc

@@ -1,8 +1,10 @@
 # $IdPath$
 
-yasm_SOURCES += \
+bin_PROGRAMS += yasm
+yasm_SOURCES = \
 	frontends/yasm/yasm.c		\
 	frontends/yasm/yasm-options.c	\
 	frontends/yasm/yasm-options.h	\
 	frontends/yasm/yasm-module.h	\
 	frontends/yasm/yasm-module.c
+yasm_LDADD = libyasm.la @LIBLTDL@ $(INTLLIBS) @LIBADD_DL@ $(YASM_MODULES)

libyasm/Makefile.inc

@@ -1,5 +1,6 @@
 # $IdPath$
 
+lib_LTLIBRARIES += libyasm.la
 libyasm_la_SOURCES = \
 	libyasm/bytecode.c	\
 	libyasm/bytecode.h	\
@@ -39,6 +40,7 @@ libyasm_la_SOURCES = \
 	libyasm/xmalloc.c	\
 	libyasm/xstrdup.c	\
 	libyasm/strcasecmp.c
+libyasm_la_LIBADD = @LTLIBOBJS@
 libyasm_la_LDFLAGS = -no-undefined
 
 EXTRA_DIST += \

modules/Makefile.inc

@@ -13,7 +13,7 @@ lib_LTLIBRARIES += yasm-nasm.la
 yasm_nasm_la_SOURCES =
 yasm_nasm_la_LDFLAGS = -module -avoid-version
 yasm_nasm_la_LIBADD = libyasm.la
-yasm_LDADD += -dlopen yasm-nasm.la
+YASM_MODULES += -dlopen yasm-nasm.la
 
 include modules/arch/Makefile.inc
 include modules/parsers/Makefile.inc

modules/arch/x86/Makefile.inc

@@ -10,7 +10,7 @@ yasm_x86_la_SOURCES = \
 	x86id.c
 yasm_x86_la_LDFLAGS = -module -avoid-version
 yasm_x86_la_LIBADD = libyasm.la
-yasm_LDADD += -dlpreopen yasm-x86.la
+YASM_MODULES += -dlopen yasm-x86.la
 
 x86id.c: $(srcdir)/modules/arch/x86/x86id.re re2c$(EXEEXT) $(srcdir)/tools/re2c/cleanup.pl
 	$(top_builddir)/re2c$(EXEEXT) -b $(srcdir)/modules/arch/x86/x86id.re | $(PERL) $(srcdir)/tools/re2c/cleanup.pl | sed "/^#l/ s,re2c-out\.c,$@," > $@

modules/dbgfmts/null/Makefile.inc

@@ -6,4 +6,4 @@ yasm_null_la_SOURCES = \
 	modules/dbgfmts/null/null-dbgfmt.c
 yasm_null_la_LDFLAGS = -module -avoid-version
 yasm_null_la_LIBADD = libyasm.la
-yasm_LDADD += -dlpreopen yasm-null.la
+YASM_MODULES += -dlopen yasm-null.la

modules/objfmts/bin/Makefile.inc

@@ -6,7 +6,7 @@ yasm_bin_la_SOURCES = \
 	modules/objfmts/bin/bin-objfmt.c
 yasm_bin_la_LDFLAGS = -module -avoid-version
 yasm_bin_la_LIBADD = libyasm.la
-yasm_LDADD += -dlopen yasm-bin.la
+YASM_MODULES += -dlopen yasm-bin.la
 
 EXTRA_DIST += \
 	modules/objfmts/bin/tests/Makefile.inc

modules/objfmts/coff/Makefile.inc

@@ -6,7 +6,7 @@ yasm_coff_la_SOURCES = \
 	modules/objfmts/coff/coff-objfmt.c
 yasm_coff_la_LDFLAGS = -module -avoid-version
 yasm_coff_la_LIBADD = libyasm.la
-yasm_LDADD += -dlopen yasm-coff.la
+YASM_MODULES += -dlopen yasm-coff.la
 
 EXTRA_DIST += \
 	modules/objfmts/coff/tests/Makefile.inc

modules/objfmts/dbg/Makefile.inc

@@ -6,4 +6,4 @@ yasm_dbg_la_SOURCES = \
 	modules/objfmts/dbg/dbg-objfmt.c
 yasm_dbg_la_LDFLAGS = -module -avoid-version
 yasm_dbg_la_LIBADD = libyasm.la
-yasm_LDADD += -dlopen yasm-dbg.la
+YASM_MODULES += -dlopen yasm-dbg.la

modules/optimizers/basic/Makefile.inc

@@ -6,4 +6,4 @@ yasm_basic_la_SOURCES = \
 	modules/optimizers/basic/basic-optimizer.c
 yasm_basic_la_LDFLAGS = -module -avoid-version
 yasm_basic_la_LIBADD = libyasm.la
-yasm_LDADD += -dlpreopen yasm-basic.la
+YASM_MODULES += -dlopen yasm-basic.la

modules/parsers/nasm/Makefile.inc

@@ -11,7 +11,7 @@ yasm_nasm_la_SOURCES += \
 	nasm-token.c
 #yasm_nasm_la_LDFLAGS = -module -avoid-version
 #yasm_nasm_la_LIBADD = libyasm.la
-#yasm_LDADD += -dlpreopen yasm-nasm.la
+#YASM_MODULES += -dlopen yasm-nasm.la
 
 nasm-token.c: $(srcdir)/modules/parsers/nasm/nasm-token.re re2c$(EXEEXT) $(srcdir)/tools/re2c/cleanup.pl
 	$(top_builddir)/re2c$(EXEEXT) -b $(srcdir)/modules/parsers/nasm/nasm-token.re | $(PERL) $(srcdir)/tools/re2c/cleanup.pl | sed "/^#l/ s,re2c-out\.c,$@," > $@

modules/preprocs/nasm/Makefile.inc

@@ -25,4 +25,4 @@ EXTRA_DIST += modules/preprocs/nasm/macros.pl \
 
 #yasm_nasm_la_LDFLAGS = -module -avoid-version
 #yasm_nasm_la_LIBADD = libyasm.la
-#yasm_LDADD += -dlopen yasm-nasm.la
+#YASM_MODULES += -dlopen yasm-nasm.la

modules/preprocs/raw/Makefile.inc

@@ -6,4 +6,4 @@ yasm_raw_la_SOURCES = \
 	modules/preprocs/raw/raw-preproc.c
 yasm_raw_la_LDFLAGS = -module -avoid-version
 yasm_raw_la_LIBADD = libyasm.la
-yasm_LDADD += -dlpreopen yasm-raw.la
+YASM_MODULES += -dlopen yasm-raw.la

modules/preprocs/yapp/Makefile.inc

@@ -9,7 +9,7 @@ yasm_yapp_la_SOURCES = \
 	modules/preprocs/yapp/yapp-token.l
 yasm_yapp_la_LDFLAGS = -module -avoid-version
 yasm_yapp_la_LIBADD = libyasm.la
-yasm_LDADD += -dlopen yasm-yapp.la
+YASM_MODULES += -dlopen yasm-yapp.la
 
 BUILT_SOURCES += \
 	yapp-token.c