From: Peter Johnson <peter@tortall.net>
Date: Tue, 1 Apr 2003 05:24:32 +0000 (-0000)
Subject: Rename yasm-module to yasm_module for better libtool compatibility (part of
X-Git-Tag: v0.2.2~3^2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4fe05c29f2b979033a2c4de2cc2ea16b279c4c7;p=yasm

Rename yasm-module to yasm_module for better libtool compatibility (part of
tracking down an installation bug).

svn path=/trunk/yasm/; revision=907
---

diff --git a/frontends/yasm/yasm-module.c b/frontends/yasm/yasm-module.c
index cfe19d53..c397c0ce 100644
--- a/frontends/yasm/yasm-module.c
+++ b/frontends/yasm/yasm-module.c
@@ -79,7 +79,7 @@ load_module(const char *keyword)
 
     /* Look for dynamic module.  First build full module name from keyword. */
     name = yasm_xmalloc(5+strlen(keyword)+1);
-    strcpy(name, "yasm-");
+    strcpy(name, "yasm_");
     strcat(name, keyword);
     handle = lt_dlopenext(name);
 
diff --git a/modules/Makefile.inc b/modules/Makefile.inc
index 753a8c6b..3b1e5eb1 100644
--- a/modules/Makefile.inc
+++ b/modules/Makefile.inc
@@ -9,11 +9,11 @@ EXTRA_DIST += \
 
 # Modules with more than one type of interface
 
-lib_LTLIBRARIES += yasm-nasm.la
+lib_LTLIBRARIES += yasm_nasm.la
 yasm_nasm_la_SOURCES =
 yasm_nasm_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_nasm_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-nasm.la
+YASM_MODULES += -dlopen yasm_nasm.la
 
 include modules/arch/Makefile.inc
 include modules/parsers/Makefile.inc
diff --git a/modules/arch/x86/Makefile.inc b/modules/arch/x86/Makefile.inc
index bee5f93b..f6a46621 100644
--- a/modules/arch/x86/Makefile.inc
+++ b/modules/arch/x86/Makefile.inc
@@ -1,6 +1,6 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-x86.la
+lib_LTLIBRARIES += yasm_x86.la
 
 yasm_x86_la_SOURCES = \
 	modules/arch/x86/x86arch.c	\
@@ -10,7 +10,7 @@ yasm_x86_la_SOURCES = \
 	x86id.c
 yasm_x86_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_x86_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen 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) -s $(srcdir)/modules/arch/x86/x86id.re | $(PERL) $(srcdir)/tools/re2c/cleanup.pl | sed "/^#l/ s,re2c-out\.c,$@," > $@
diff --git a/modules/dbgfmts/null/Makefile.inc b/modules/dbgfmts/null/Makefile.inc
index 83dae28a..acab2965 100644
--- a/modules/dbgfmts/null/Makefile.inc
+++ b/modules/dbgfmts/null/Makefile.inc
@@ -1,9 +1,9 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-null.la
+lib_LTLIBRARIES += yasm_null.la
 
 yasm_null_la_SOURCES = \
 	modules/dbgfmts/null/null-dbgfmt.c
 yasm_null_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_null_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-null.la
+YASM_MODULES += -dlopen yasm_null.la
diff --git a/modules/objfmts/bin/Makefile.inc b/modules/objfmts/bin/Makefile.inc
index 936534d6..ad1a7209 100644
--- a/modules/objfmts/bin/Makefile.inc
+++ b/modules/objfmts/bin/Makefile.inc
@@ -1,12 +1,12 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-bin.la
+lib_LTLIBRARIES += yasm_bin.la
 
 yasm_bin_la_SOURCES = \
 	modules/objfmts/bin/bin-objfmt.c
 yasm_bin_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_bin_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-bin.la
+YASM_MODULES += -dlopen yasm_bin.la
 
 EXTRA_DIST += \
 	modules/objfmts/bin/tests/Makefile.inc
diff --git a/modules/objfmts/coff/Makefile.inc b/modules/objfmts/coff/Makefile.inc
index a64c9fb6..8257b28c 100644
--- a/modules/objfmts/coff/Makefile.inc
+++ b/modules/objfmts/coff/Makefile.inc
@@ -1,12 +1,12 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-coff.la
+lib_LTLIBRARIES += yasm_coff.la
 
 yasm_coff_la_SOURCES = \
 	modules/objfmts/coff/coff-objfmt.c
 yasm_coff_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_coff_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-coff.la
+YASM_MODULES += -dlopen yasm_coff.la
 
 EXTRA_DIST += \
 	modules/objfmts/coff/tests/Makefile.inc
diff --git a/modules/objfmts/dbg/Makefile.inc b/modules/objfmts/dbg/Makefile.inc
index f80da10e..aa78484f 100644
--- a/modules/objfmts/dbg/Makefile.inc
+++ b/modules/objfmts/dbg/Makefile.inc
@@ -1,9 +1,9 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-dbg.la
+lib_LTLIBRARIES += yasm_dbg.la
 
 yasm_dbg_la_SOURCES = \
 	modules/objfmts/dbg/dbg-objfmt.c
 yasm_dbg_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_dbg_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-dbg.la
+YASM_MODULES += -dlopen yasm_dbg.la
diff --git a/modules/objfmts/win32/Makefile.inc b/modules/objfmts/win32/Makefile.inc
index 8cc8aadc..17fb8797 100644
--- a/modules/objfmts/win32/Makefile.inc
+++ b/modules/objfmts/win32/Makefile.inc
@@ -1,12 +1,12 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-win32.la
+lib_LTLIBRARIES += yasm_win32.la
 
 yasm_win32_la_SOURCES = \
 	modules/objfmts/coff/coff-objfmt.c
 yasm_win32_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_win32_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-win32.la
+YASM_MODULES += -dlopen yasm_win32.la
 
 EXTRA_DIST += \
 	modules/objfmts/win32/tests/Makefile.inc
diff --git a/modules/optimizers/basic/Makefile.inc b/modules/optimizers/basic/Makefile.inc
index cf955a66..c1296a62 100644
--- a/modules/optimizers/basic/Makefile.inc
+++ b/modules/optimizers/basic/Makefile.inc
@@ -1,9 +1,9 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-basic.la
+lib_LTLIBRARIES += yasm_basic.la
 
 yasm_basic_la_SOURCES = \
 	modules/optimizers/basic/basic-optimizer.c
 yasm_basic_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_basic_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-basic.la
+YASM_MODULES += -dlopen yasm_basic.la
diff --git a/modules/parsers/nasm/Makefile.inc b/modules/parsers/nasm/Makefile.inc
index c14f0dbb..5b06bb69 100644
--- a/modules/parsers/nasm/Makefile.inc
+++ b/modules/parsers/nasm/Makefile.inc
@@ -1,6 +1,6 @@
 # $IdPath$
 
-#lib_LTLIBRARIES += yasm-nasm.la
+#lib_LTLIBRARIES += yasm_nasm.la
 
 yasm_nasm_la_SOURCES += \
 	modules/parsers/nasm/nasm-parser.h	\
@@ -11,7 +11,7 @@ yasm_nasm_la_SOURCES += \
 	nasm-token.c
 #yasm_nasm_la_LDFLAGS = -module -avoid-version -no-undefined
 #yasm_nasm_la_LIBADD = libyasm.la
-#YASM_MODULES += -dlopen 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,$@," > $@
diff --git a/modules/preprocs/nasm/Makefile.inc b/modules/preprocs/nasm/Makefile.inc
index 388eb482..3b65abed 100644
--- a/modules/preprocs/nasm/Makefile.inc
+++ b/modules/preprocs/nasm/Makefile.inc
@@ -1,6 +1,6 @@
 # $IdPath$
 
-#lib_LTLIBRARIES += yasm-nasm.la
+#lib_LTLIBRARIES += yasm_nasm.la
 
 yasm_nasm_la_SOURCES += \
 	modules/preprocs/nasm/nasm-preproc.c \
@@ -25,4 +25,4 @@ EXTRA_DIST += modules/preprocs/nasm/macros.pl \
 
 #yasm_nasm_la_LDFLAGS = -module -avoid-version -no-undefined
 #yasm_nasm_la_LIBADD = libyasm.la
-#YASM_MODULES += -dlopen yasm-nasm.la
+#YASM_MODULES += -dlopen yasm_nasm.la
diff --git a/modules/preprocs/raw/Makefile.inc b/modules/preprocs/raw/Makefile.inc
index 6cc25d06..86bcde27 100644
--- a/modules/preprocs/raw/Makefile.inc
+++ b/modules/preprocs/raw/Makefile.inc
@@ -1,9 +1,9 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-raw.la
+lib_LTLIBRARIES += yasm_raw.la
 
 yasm_raw_la_SOURCES = \
 	modules/preprocs/raw/raw-preproc.c
 yasm_raw_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_raw_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-raw.la
+YASM_MODULES += -dlopen yasm_raw.la
diff --git a/modules/preprocs/yapp/Makefile.inc b/modules/preprocs/yapp/Makefile.inc
index 1edb1265..a6e48c57 100644
--- a/modules/preprocs/yapp/Makefile.inc
+++ b/modules/preprocs/yapp/Makefile.inc
@@ -1,6 +1,6 @@
 # $IdPath$
 
-lib_LTLIBRARIES += yasm-yapp.la
+lib_LTLIBRARIES += yasm_yapp.la
 
 yasm_yapp_la_SOURCES = \
 	modules/preprocs/yapp/yapp-preproc.h	\
@@ -9,7 +9,7 @@ yasm_yapp_la_SOURCES = \
 	modules/preprocs/yapp/yapp-token.l
 yasm_yapp_la_LDFLAGS = -module -avoid-version -no-undefined
 yasm_yapp_la_LIBADD = libyasm.la
-YASM_MODULES += -dlopen yasm-yapp.la
+YASM_MODULES += -dlopen yasm_yapp.la
 
 BUILT_SOURCES += \
 	yapp-token.c