diff options
| author | marha <marha@users.sourceforge.net> | 2011-03-07 09:13:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-03-07 09:13:59 +0000 |
| commit | 83215c83294a6e1d3fb6e025b08443ab77a9da69 (patch) | |
| tree | 8b87be53c3982e622f67637e9baab4812a847936 | |
| parent | e0f1ecf2368f5f8d00873fd707d10abc12772334 (diff) | |
| download | vcxsrv-83215c83294a6e1d3fb6e025b08443ab77a9da69.tar.gz vcxsrv-83215c83294a6e1d3fb6e025b08443ab77a9da69.tar.bz2 vcxsrv-83215c83294a6e1d3fb6e025b08443ab77a9da69.zip | |
Use flex and bison from tools/mhmake
| -rw-r--r-- | xorg-server/hw/xwin/makefile | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile index b45f2744c..462c2c0e2 100644 --- a/xorg-server/hw/xwin/makefile +++ b/xorg-server/hw/xwin/makefile @@ -157,18 +157,8 @@ DEFINES += $(DEFS:-D%=%) HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB RELOCATE_PROJECTROO INCLUDES += ..\..\miext\rootless - - - INCLUDES += $(OBJDIR) -AM_YFLAGS = -d -AM_LFLAGS = -i - -$(OBJDIR)\winprefslex.c: winprefslex.l $(OBJDIR)\winprefsyacc.h - flex $(AM_LFLAGS) -o$@ $< - -$(OBJDIR)\winprefsyacc.c : $(OBJDIR)\winprefsyacc.h # this is to avoid building at the same time of winprefsyacc.obj and winprefsyacc.h, this will give error during generation of winprefsyacc.h because winprefsyacc.c is locked +$(OBJDIR)\winprefslex.c $(OBJDIR)\winprefsyacc.c $(OBJDIR)\winprefsyacc.h: winprefslex.l winprefsyacc.y $(OBJDIR)\winprefsyacc.h + doflexbison.bat $(subst \,/,$(OBJDIR)) -$(OBJDIR)\winprefsyacc.c $(OBJDIR)\winprefsyacc.h: winprefsyacc.y - bison $(AM_YFLAGS) -o$(OBJDIR)\winprefsyacc.c $< |