From: Peter Johnson <peter@tortall.net>
Date: Sat, 8 Mar 2003 19:55:56 +0000 (-0000)
Subject: Move yasm_std_errwarn and yasm_std_linemgr into libyasm.
X-Git-Tag: v0.2.0~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=854ea00a2b6bb18e0e574258d824608c7aa4fef2;p=yasm

Move yasm_std_errwarn and yasm_std_linemgr into libyasm.

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

diff --git a/frontends/yasm/Makefile.inc b/frontends/yasm/Makefile.inc
index 05f3f169..9f44d71d 100644
--- a/frontends/yasm/Makefile.inc
+++ b/frontends/yasm/Makefile.inc
@@ -34,6 +34,8 @@ libyasm_la_SOURCES = \
 	src/bitvect.h		\
 	src/valparam.c		\
 	src/valparam.h		\
+	src/errwarn.c		\
+	src/linemgr.c		\
 	src/xmalloc.c		\
 	src/xstrdup.c		\
 	src/strcasecmp.c
@@ -43,9 +45,7 @@ yasm_SOURCES += \
 	src/options.c		\
 	src/options.h		\
 	src/module.h		\
-	src/module.c		\
-	src/errwarn.c		\
-	src/linemgr.c
+	src/module.c
 
 
 EXTRA_DIST += \
diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 2fcf262b..a5a2299e 100644
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -52,12 +52,6 @@
 #include "arch.h"
 
 
-/* YASM's standard line manager (for parse stage). */
-extern yasm_linemgr yasm_std_linemgr;
-
-/* YASM's standard errwarn handlers. */
-extern yasm_errwarn yasm_std_errwarn;
-
 /* Extra path to search for our modules. */
 #ifndef YASM_MODULE_PATH_ENV
 # define YASM_MODULE_PATH_ENV	"YASM_MODULE_PATH"
diff --git a/libyasm/Makefile.inc b/libyasm/Makefile.inc
index 05f3f169..9f44d71d 100644
--- a/libyasm/Makefile.inc
+++ b/libyasm/Makefile.inc
@@ -34,6 +34,8 @@ libyasm_la_SOURCES = \
 	src/bitvect.h		\
 	src/valparam.c		\
 	src/valparam.h		\
+	src/errwarn.c		\
+	src/linemgr.c		\
 	src/xmalloc.c		\
 	src/xstrdup.c		\
 	src/strcasecmp.c
@@ -43,9 +45,7 @@ yasm_SOURCES += \
 	src/options.c		\
 	src/options.h		\
 	src/module.h		\
-	src/module.c		\
-	src/errwarn.c		\
-	src/linemgr.c
+	src/module.c
 
 
 EXTRA_DIST += \
diff --git a/libyasm/errwarn.h b/libyasm/errwarn.h
index 9645c4a4..78c9a131 100644
--- a/libyasm/errwarn.h
+++ b/libyasm/errwarn.h
@@ -94,4 +94,6 @@ struct yasm_errwarn {
     char * (*conv_unprint) (char ch);
 };
 
+extern yasm_errwarn yasm_std_errwarn;
+
 #endif
diff --git a/libyasm/linemgr.h b/libyasm/linemgr.h
index 139d0b68..7028443b 100644
--- a/libyasm/linemgr.h
+++ b/libyasm/linemgr.h
@@ -82,4 +82,6 @@ struct yasm_linemgr {
 						      int type);
 };
 
+extern yasm_linemgr yasm_std_linemgr;
+
 #endif
diff --git a/modules/Makefile.inc b/modules/Makefile.inc
index 05f3f169..9f44d71d 100644
--- a/modules/Makefile.inc
+++ b/modules/Makefile.inc
@@ -34,6 +34,8 @@ libyasm_la_SOURCES = \
 	src/bitvect.h		\
 	src/valparam.c		\
 	src/valparam.h		\
+	src/errwarn.c		\
+	src/linemgr.c		\
 	src/xmalloc.c		\
 	src/xstrdup.c		\
 	src/strcasecmp.c
@@ -43,9 +45,7 @@ yasm_SOURCES += \
 	src/options.c		\
 	src/options.h		\
 	src/module.h		\
-	src/module.c		\
-	src/errwarn.c		\
-	src/linemgr.c
+	src/module.c
 
 
 EXTRA_DIST += \
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 05f3f169..9f44d71d 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -34,6 +34,8 @@ libyasm_la_SOURCES = \
 	src/bitvect.h		\
 	src/valparam.c		\
 	src/valparam.h		\
+	src/errwarn.c		\
+	src/linemgr.c		\
 	src/xmalloc.c		\
 	src/xstrdup.c		\
 	src/strcasecmp.c
@@ -43,9 +45,7 @@ yasm_SOURCES += \
 	src/options.c		\
 	src/options.h		\
 	src/module.h		\
-	src/module.c		\
-	src/errwarn.c		\
-	src/linemgr.c
+	src/module.c
 
 
 EXTRA_DIST += \
diff --git a/src/errwarn.h b/src/errwarn.h
index 9645c4a4..78c9a131 100644
--- a/src/errwarn.h
+++ b/src/errwarn.h
@@ -94,4 +94,6 @@ struct yasm_errwarn {
     char * (*conv_unprint) (char ch);
 };
 
+extern yasm_errwarn yasm_std_errwarn;
+
 #endif
diff --git a/src/linemgr.h b/src/linemgr.h
index 139d0b68..7028443b 100644
--- a/src/linemgr.h
+++ b/src/linemgr.h
@@ -82,4 +82,6 @@ struct yasm_linemgr {
 						      int type);
 };
 
+extern yasm_linemgr yasm_std_linemgr;
+
 #endif
diff --git a/src/main.c b/src/main.c
index 2fcf262b..a5a2299e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -52,12 +52,6 @@
 #include "arch.h"
 
 
-/* YASM's standard line manager (for parse stage). */
-extern yasm_linemgr yasm_std_linemgr;
-
-/* YASM's standard errwarn handlers. */
-extern yasm_errwarn yasm_std_errwarn;
-
 /* Extra path to search for our modules. */
 #ifndef YASM_MODULE_PATH_ENV
 # define YASM_MODULE_PATH_ENV	"YASM_MODULE_PATH"