Update main files to include support for yapp.

This includes defaulting to yapp for ./yasm -e passes.

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

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index d4eb2defbc9c3855b2afd974f425475a6e8b870e..a20108fa2154e1966cff4193eaa9878b28a0018a 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
 
        /* If not already specified, default to raw preproc. */
        if (!cur_preproc)
-           cur_preproc = find_preproc("raw");
+           cur_preproc = find_preproc("yapp");
        assert(cur_preproc != NULL);
 
        /* Pre-process until done */

diff --git a/libyasm/preproc.h b/libyasm/preproc.h
index 8164e1f7c91b41caf13c457a6cf712799bb51687..584e88e9f501e66341ae83364c35762068894490 100644 (file)
--- a/libyasm/preproc.h
+++ b/libyasm/preproc.h
@@ -48,6 +48,7 @@ struct preproc {
 
 /* Available preprocessors */
 extern preproc raw_preproc;
+extern preproc yapp_preproc;
 
 /* Finds a preproc based on its keyword.  Returns NULL if no match was found.
  */

diff --git a/modules/preprocs/Makefile.inc b/modules/preprocs/Makefile.inc
index df9414feb01be700cc4c0c6f92318e1ec43bceaa..2e256163e1316e4cedf200315f4d551df691c223 100644 (file)
--- a/modules/preprocs/Makefile.inc
+++ b/modules/preprocs/Makefile.inc
@@ -1,8 +1,10 @@
 # $IdPath$
 
 EXTRA_DIST += \
-       src/preprocs/raw/Makefile.inc
+       src/preprocs/raw/Makefile.inc \
+       src/preprocs/yapp/Makefile.inc
 
 YASMPREPROCFILES =
 include src/preprocs/raw/Makefile.inc
+include src/preprocs/yapp/Makefile.inc
 yasm_SOURCES += $(YASMPREPROCFILES)

diff --git a/src/main.c b/src/main.c
index d4eb2defbc9c3855b2afd974f425475a6e8b870e..a20108fa2154e1966cff4193eaa9878b28a0018a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -189,7 +189,7 @@ main(int argc, char *argv[])
 
        /* If not already specified, default to raw preproc. */
        if (!cur_preproc)
-           cur_preproc = find_preproc("raw");
+           cur_preproc = find_preproc("yapp");
        assert(cur_preproc != NULL);
 
        /* Pre-process until done */

diff --git a/src/preproc.c b/src/preproc.c
index 1c7a802fda886da8e6fb6abbd72bd2281851bbcf..560e08c295f2e05c7ab8ad361de9b04b0749d0eb 100644 (file)
--- a/src/preproc.c
+++ b/src/preproc.c
@@ -34,6 +34,7 @@
 /*@-nullassign@*/
 static preproc *preprocs[] = {
     &raw_preproc,
+    &yapp_preproc,
     NULL
 };
 /*@=nullassign@*/

diff --git a/src/preproc.h b/src/preproc.h
index 8164e1f7c91b41caf13c457a6cf712799bb51687..584e88e9f501e66341ae83364c35762068894490 100644 (file)
--- a/src/preproc.h
+++ b/src/preproc.h
@@ -48,6 +48,7 @@ struct preproc {
 
 /* Available preprocessors */
 extern preproc raw_preproc;
+extern preproc yapp_preproc;
 
 /* Finds a preproc based on its keyword.  Returns NULL if no match was found.
  */

diff --git a/src/preprocs/Makefile.inc b/src/preprocs/Makefile.inc
index df9414feb01be700cc4c0c6f92318e1ec43bceaa..2e256163e1316e4cedf200315f4d551df691c223 100644 (file)
--- a/src/preprocs/Makefile.inc
+++ b/src/preprocs/Makefile.inc
@@ -1,8 +1,10 @@
 # $IdPath$
 
 EXTRA_DIST += \
-       src/preprocs/raw/Makefile.inc
+       src/preprocs/raw/Makefile.inc \
+       src/preprocs/yapp/Makefile.inc
 
 YASMPREPROCFILES =
 include src/preprocs/raw/Makefile.inc
+include src/preprocs/yapp/Makefile.inc
 yasm_SOURCES += $(YASMPREPROCFILES)