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 05f3f169ed85f86fb8e94c232b5794439bfc2e3b..9f44d71dcd91df4e8e1aca9b9136ce6f302d26df 100644 (file)
--- 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 2fcf262b9e1410e05c065427600c05c8e49aff66..a5a2299e8730f370e3bb2552fdbf13ca811bc9df 100644 (file)
--- 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 05f3f169ed85f86fb8e94c232b5794439bfc2e3b..9f44d71dcd91df4e8e1aca9b9136ce6f302d26df 100644 (file)
--- 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 9645c4a447f6a154cf9c388e9e45b0a89b02681a..78c9a1318baf013a8885b11b51a8d59b00179042 100644 (file)
--- 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 139d0b68c46aea254b0e20fa3d961de867b1932f..7028443b7b48fc56a3dea57cb125566ad58172fd 100644 (file)
--- 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 05f3f169ed85f86fb8e94c232b5794439bfc2e3b..9f44d71dcd91df4e8e1aca9b9136ce6f302d26df 100644 (file)
--- 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 05f3f169ed85f86fb8e94c232b5794439bfc2e3b..9f44d71dcd91df4e8e1aca9b9136ce6f302d26df 100644 (file)
--- 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 9645c4a447f6a154cf9c388e9e45b0a89b02681a..78c9a1318baf013a8885b11b51a8d59b00179042 100644 (file)
--- 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 139d0b68c46aea254b0e20fa3d961de867b1932f..7028443b7b48fc56a3dea57cb125566ad58172fd 100644 (file)
--- 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 2fcf262b9e1410e05c065427600c05c8e49aff66..a5a2299e8730f370e3bb2552fdbf13ca811bc9df 100644 (file)
--- 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"