Remove yapp from Mkfiles builds.

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

diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj
index 87b6405ad982d1ac36de411be0212e041fb39c6f..a16e7a985bb860044bdc758ac95939a40b12b7f1 100644 (file)
--- a/Mkfiles/Makefile.dj
+++ b/Mkfiles/Makefile.dj
@@ -63,16 +63,11 @@ MODULES_PREPROCS_NASM_OBJS= \
  modules/preprocs/nasm/nasmlib.o \
  nasm-macros.o
 
-MODULES_PREPROCS_YAPP_OBJS = \
- modules/preprocs/yapp/yapp-preproc.o \
- yapp-token.o
-
 MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o \
 
 MODULES_PREPROCS_OBJS = \
  $(MODULES_PREPROCS_NASM_OBJS) \
- $(MODULES_PREPROCS_YAPP_OBJS) \
  $(MODULES_PREPROCS_RAW_OBJS)
 
 MODULES_OBJS = \

diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat
index 7ce9c72ba27d0ec63e7efb2a196d195ffcdc220a..57d332cc183867b7a5ad2906a55a301b65503ab1 100644 (file)
--- a/Mkfiles/Makefile.flat
+++ b/Mkfiles/Makefile.flat
@@ -66,16 +66,11 @@ MODULES_PREPROCS_NASM_OBJS= \
  modules/preprocs/nasm/nasmlib.o \
  nasm-macros.o
 
-MODULES_PREPROCS_YAPP_OBJS = \
- modules/preprocs/yapp/yapp-preproc.o \
- yapp-token.o
-
 MODULES_PREPROCS_RAW_OBJS = \
  modules/preprocs/raw/raw-preproc.o \
 
 MODULES_PREPROCS_OBJS = \
  $(MODULES_PREPROCS_NASM_OBJS) \
- $(MODULES_PREPROCS_YAPP_OBJS) \
  $(MODULES_PREPROCS_RAW_OBJS)
 
 MODULES_OBJS = \

diff --git a/Mkfiles/vc/modules/modules.dsp b/Mkfiles/vc/modules/modules.dsp
index 2512bd360ee6120f6defafc2d3ee82f5fb5cc12b..5913f470e696563e8a921aa48c31d21699b835cd 100644 (file)
--- a/Mkfiles/vc/modules/modules.dsp
+++ b/Mkfiles/vc/modules/modules.dsp
@@ -210,26 +210,6 @@ SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
 SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.h\r
 # End Source File\r
 # End Group\r
-# Begin Group "yapp"\r
-\r
-# PROP Default_Filter ""\r
-# Begin Source File\r
-\r
-SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.c"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.h"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\..\yapp-token.c"\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE="..\..\..\modules\preprocs\yapp\yapp-token.h"\r
-# End Source File\r
-# End Group\r
 # Begin Group "raw"\r
 \r
 # PROP Default_Filter ""\r

diff --git a/Mkfiles/vc/modules/modules.mak b/Mkfiles/vc/modules/modules.mak
index eb12d5543cf5ae9c5dc8f96311275aadb31f70c7..c4585876a6faabcd9cae51ad363e55bb229670b0 100644 (file)
--- a/Mkfiles/vc/modules/modules.mak
+++ b/Mkfiles/vc/modules/modules.mak
@@ -67,8 +67,6 @@ CLEAN :
        -@erase "$(INTDIR)\x86bc.obj"\r
        -@erase "$(INTDIR)\x86expr.obj"\r
        -@erase "$(INTDIR)\x86id.obj"\r
-       -@erase "$(INTDIR)\yapp-preproc.obj"\r
-       -@erase "$(INTDIR)\yapp-token.obj"\r
        -@erase "$(OUTDIR)\modules.lib"\r
 \r
 "$(OUTDIR)" :\r
@@ -132,8 +130,6 @@ LIB32_OBJS= \
        "$(INTDIR)\nasm-pp.obj" \\r
        "$(INTDIR)\nasm-preproc.obj" \\r
        "$(INTDIR)\nasmlib.obj" \\r
-       "$(INTDIR)\yapp-preproc.obj" \\r
-       "$(INTDIR)\yapp-token.obj" \\r
        "$(INTDIR)\raw-preproc.obj" \\r
        "..\libyasm\Release\libyasm.lib"\r
 \r
@@ -185,8 +181,6 @@ CLEAN :
        -@erase "$(INTDIR)\x86bc.obj"\r
        -@erase "$(INTDIR)\x86expr.obj"\r
        -@erase "$(INTDIR)\x86id.obj"\r
-       -@erase "$(INTDIR)\yapp-preproc.obj"\r
-       -@erase "$(INTDIR)\yapp-token.obj"\r
        -@erase "$(OUTDIR)\modules.lib"\r
 \r
 "$(OUTDIR)" :\r
@@ -250,8 +244,6 @@ LIB32_OBJS= \
        "$(INTDIR)\nasm-pp.obj" \\r
        "$(INTDIR)\nasm-preproc.obj" \\r
        "$(INTDIR)\nasmlib.obj" \\r
-       "$(INTDIR)\yapp-preproc.obj" \\r
-       "$(INTDIR)\yapp-token.obj" \\r
        "$(INTDIR)\raw-preproc.obj" \\r
        "..\libyasm\Debug\libyasm.lib"\r
 \r
@@ -375,18 +367,6 @@ SOURCE=..\..\..\modules\preprocs\nasm\nasmlib.c
        $(CPP) $(CPP_PROJ) $(SOURCE)\r
 \r
 \r
-SOURCE="..\..\..\modules\preprocs\yapp\yapp-preproc.c"\r
-\r
-"$(INTDIR)\yapp-preproc.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
-SOURCE="..\..\..\yapp-token.c"\r
-\r
-"$(INTDIR)\yapp-token.obj" : $(SOURCE) "$(INTDIR)"\r
-       $(CPP) $(CPP_PROJ) $(SOURCE)\r
-\r
-\r
 SOURCE="..\..\..\modules\preprocs\raw\raw-preproc.c"\r
 \r
 "$(INTDIR)\raw-preproc.obj" : $(SOURCE) "$(INTDIR)"\r

diff --git a/Mkfiles/vc/yasm-module.c b/Mkfiles/vc/yasm-module.c
index 319acd7b13a87c02f1970729f1d9efe25a24f627..260274fad5ee039523f1bd014e2ceb1623c96906 100644 (file)
--- a/Mkfiles/vc/yasm-module.c
+++ b/Mkfiles/vc/yasm-module.c
@@ -62,7 +62,6 @@ static module modules[] = {
     {"nasm", "parser", &yasm_nasm_LTX_parser},
     {"nasm", "preproc", &yasm_nasm_LTX_preproc},
     {"raw", "preproc", &yasm_raw_LTX_preproc},
-    {"yapp", "preproc", &yasm_yapp_LTX_preproc},
 };