September 2006 - Wine-Commits

Jeff Latimer : gdi: Change the metafile. c test to use sprintf instead of snprintf for portability.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 9e9095fe7aeb1b5321708fcfb8aac4e31fcc9374 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9e9095fe7aeb1b5321708fc… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Fri Sep 8 23:10:00 2006 +1000 gdi: Change the metafile.c test to use sprintf instead of snprintf for portability. --- dlls/gdi/tests/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi/tests/metafile.c b/dlls/gdi/tests/metafile.c index 7f4b0ae..3610bf8 100644 --- a/dlls/gdi/tests/metafile.c +++ b/dlls/gdi/tests/metafile.c @@ -1354,7 +1354,7 @@ static void checkConvertedFrameAndBounds case MM_ISOTROPIC: mm_str = "MM_ISOTROPIC"; break; default: mm_str = "Unexpected"; } - snprintf(buf, 64, "mm=%s, xExt=%ld, yExt=%ld", mm_str, xExt, yExt); + sprintf(buf, "mm=%s, xExt=%ld, yExt=%ld", mm_str, xExt, yExt); msg = buf; }

1 0

Alexandre Julliard : kernel: An unavailable address for the PE file can cause ERROR_NOT_ENOUGH_MEMORY too .
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 33f047fe56532da6505e309802fc9f99a11657c5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=33f047fe56532da6505e309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 23:14:26 2006 +0200 kernel: An unavailable address for the PE file can cause ERROR_NOT_ENOUGH_MEMORY too. --- dlls/kernel/process.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c index 9f80411..7e75822 100644 --- a/dlls/kernel/process.c +++ b/dlls/kernel/process.c @@ -914,7 +914,9 @@ void __wine_kernel_init(void) DWORD error = GetLastError(); /* if Win16/DOS format, or unavailable address, exec a new process with the proper setup */ - if (error == ERROR_BAD_EXE_FORMAT || error == ERROR_INVALID_ADDRESS) + if (error == ERROR_BAD_EXE_FORMAT || + error == ERROR_INVALID_ADDRESS || + error == ERROR_NOT_ENOUGH_MEMORY) { if (!getenv("WINEPRELOADRESERVE")) exec_process( main_exe_name ); /* if we get back here, it failed */

1 0

Alexandre Julliard : makefiles: Make sure that all phony targets depend on 'dummy'.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: dc8c76ae3c2006e4a692c2df237fb4a41cd138af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dc8c76ae3c2006e4a692c2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 23:09:04 2006 +0200 makefiles: Make sure that all phony targets depend on 'dummy'. --- Make.rules.in | 4 ++-- Makefile.in | 2 +- dlls/Makedll.rules.in | 20 +++++++++----------- documentation/Makefile.in | 13 +++++-------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 1d3f4c3..eecbffd 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -181,7 +181,7 @@ # 'all' target first in case the enclosi all: Makefile -filter: +filter: dummy @$(TOPSRCDIR)/tools/winapi/make_filter --make $(MAKE) all .PHONY: all filter @@ -226,7 +226,7 @@ DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend -depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) +depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) dummy $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/Makefile.in b/Makefile.in index 700cbad..0f9881e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -118,7 +118,7 @@ TAGS etags: tags ctags: find $(TOPSRCDIR)/ -name '*.[ch]' -print | ctags --c-types=+px -L - -manpages htmlpages sgmlpages: +manpages htmlpages sgmlpages: dummy @cd documentation && $(MAKE) $@ clean:: diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 428d717..632730f 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -69,13 +69,13 @@ crosstest:: $(SUBDIRS:%=%/__crosstest__) # Rules for auto documentation -man: $(C_SRCS) +man: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -C$(SRCDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) -doc-html: $(C_SRCS) +doc-html: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) -doc-sgml: $(C_SRCS) +doc-sgml: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16) .PHONY: man doc-html doc-sgml @@ -88,28 +88,26 @@ ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll16 WIN16_INSTALL = $(SPEC_SRCS16:%=_install_/%) -.PHONY: install_lib install_static_implib_def install_static_implib_a +.PHONY: install_static_implib_def install_static_implib_a .PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) $(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%) -$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) +$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) dummy echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@` -install_lib: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) - -$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) +$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy $(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB) -install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) +install_static_implib_def: $(STATICIMPLIB) $(DESTDIR)$(dlldir) dummy $(INSTALL_DATA) $(STATICIMPLIB) $(DESTDIR)$(dlldir)/$(STATICIMPLIB) install_static_implib_a: $(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) -install install-lib:: install_lib @WIN16_INSTALL@ +install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) @WIN16_INSTALL@ dummy + $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) diff --git a/documentation/Makefile.in b/documentation/Makefile.in index bf23bd4..18cf1de 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in @@ -4,25 +4,22 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = none -INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext) +INSTALLDIRS = man$(api_manext) html api-guide $(DESTDIR)$(mandir)/man$(api_manext) @MAKE_RULES@ -manpages: - $(MKINSTALLDIRS) man$(api_manext) +manpages: man$(api_manext) dummy @cd $(DLLDIR) && $(MAKE) man -htmlpages: - $(MKINSTALLDIRS) html +htmlpages: html dummy @cd $(DLLDIR) && $(MAKE) doc-html -sgmlpages: - $(MKINSTALLDIRS) api-guide +sgmlpages: api-guide dummy @cd $(DLLDIR) && $(MAKE) doc-sgml .PHONY: manpages htmlpages sgmlpages -install:: manpages $(INSTALLDIRS) +install:: manpages $(DESTDIR)$(mandir)/man$(api_manext) for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done clean::

1 0

Alexandre Julliard : makefiles: Avoid empty variables in substitutions, it' s broken on BSD make.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: a82f1b0ebbf7960075c4b43968315f9b14b1cb47 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a82f1b0ebbf7960075c4b43… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 22:28:53 2006 +0200 makefiles: Avoid empty variables in substitutions, it's broken on BSD make. --- dlls/Makedll.rules.in | 25 +++++++++++++------------ programs/Makeprog.rules.in | 3 +-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index b48e710..428d717 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -19,10 +19,9 @@ SPEC_DEF = lib$(BASEMODULE).def WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) ALL_LIBS = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) -ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) STATICIMPLIB= $(IMPORTLIB:.def=.def.a) -DLL_LDPATH = -L$(DLLDIR) $(ALL_IMPORTS:%=-L$(DLLDIR)/%) +DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine all: $(MODULE)$(DLLEXT) $(SUBDIRS) @@ -32,20 +31,20 @@ all: $(MODULE)$(DLLEXT) $(SUBDIRS) # Rules for .so files $(MODULE).so: $(MAINSPEC) $(ALL_OBJS) Makefile.in - $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(ALL_IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) + $(WINEGCC) -B$(TOOLSDIR)/tools/winebuild -shared $(SRCDIR)/$(MAINSPEC) $(ALL_OBJS) $(SUBSYSTEM:%=-Wb,--subsystem,%) $(BASEADDRESS:%=-Wl,--image-base,%) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(DELAYIMPORTS:%=-Wb,-d%) $(ALL_LIBS) # Rules for .dll files $(MODULE): $(RCOBJS) $(OBJS) $(SPEC_DEF) Makefile.in - $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(DLL_LDPATH) $(ALL_IMPORTS:%=-l%) $(LIBWINE) $(ALL_LIBS) + $(DLLWRAP) -k --def $(SPEC_DEF) -o $@ $(RCOBJS) $(OBJS) $(DLL_LDPATH) $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(LIBWINE) $(ALL_LIBS) # Rules for import libraries -.PHONY: implib $(IMPLIB_OBJS:%=__static_implib__%) +.PHONY: implib $(IMPLIB_SRCS:%=__static_implib__%) -all implib: $(IMPORTLIB) $(IMPLIB_OBJS:%=__static_implib__%) +all implib: $(IMPORTLIB) $(IMPLIB_SRCS:%=__static_implib__%) -$(IMPLIB_OBJS:%=__static_implib__%): $(STATICIMPLIB) +$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) lib$(BASEMODULE).def: $(MAINSPEC) $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) @@ -87,12 +86,14 @@ EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.e DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv16) ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll16) -WIN16_INSTALL = $(ALL_SPECS16:%=_install_/%) +WIN16_INSTALL = $(SPEC_SRCS16:%=_install_/%) .PHONY: install_lib install_static_implib_def install_static_implib_a -.PHONY: $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%) +.PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) -$(ALL_SPECS16:%=_install_/%): install_lib +$(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%) + +$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@` install_lib: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) @@ -106,11 +107,11 @@ install_static_implib_def: $(STATICIMPLI install_static_implib_a: -$(IMPLIB_OBJS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) +$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) install install-lib:: install_lib @WIN16_INSTALL@ -install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_OBJS:%=_install_static_implib_/%) +install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16) diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 84cdd12..f73498e 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -11,8 +11,7 @@ # DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) -ALL_IMPORTS = $(DELAYIMPORTS) $(IMPORTS) -ALL_LIBS = $(ALL_IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) +ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) BASEMODULE = $(MODULE:.exe=) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext)

1 0

Alexandre Julliard : fonts: Avoid using the $< make variable in explicit rules.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 9f8eb41e773df9391e4297ce46c0b2f9bc398ad7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f8eb41e773df9391e4297c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 21:21:55 2006 +0200 fonts: Avoid using the $< make variable in explicit rules. --- fonts/Makefile.in | 124 ++++++++++++++++++++++++----------------------------- 1 files changed, 56 insertions(+), 68 deletions(-) diff --git a/fonts/Makefile.in b/fonts/Makefile.in index 6e33bc3..d3a74fa 100644 --- a/fonts/Makefile.in +++ b/fonts/Makefile.in @@ -58,185 +58,173 @@ all: $(FONTS) @MAKE_RULES@ -courier.ttf: courier.sfd - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ - -ms_sans_serif.ttf: ms_sans_serif.sfd - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ - -small_fonts.ttf: small_fonts.sfd - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ - -system.ttf: system.sfd - $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@ - courier-1252-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1252 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1252 96 128 8 courier-1250-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1250 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1250 96 128 8 courier-1251-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1251 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1251 96 128 8 courier-1253-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1253 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1253 96 128 8 courier-1254-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1254 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1254 96 128 8 courier-1255-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1255 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1255 96 128 8 courier-1256-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1256 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1256 96 128 8 courier-1257-96-13.fnt: courier.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1257 96 128 8 + $(LDPATH) $(SFNT2FNT) courier.ttf 13 1257 96 128 8 ms_sans_serif-1252-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1252 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1252 96 129 5 ms_sans_serif-1252-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1252 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1252 96 129 7 ms_sans_serif-1252-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1252 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1252 96 129 8 ms_sans_serif-1250-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1250 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1250 96 129 5 ms_sans_serif-1250-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1250 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1250 96 129 7 ms_sans_serif-1251-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1251 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1251 96 129 5 ms_sans_serif-1251-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1251 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1251 96 129 7 ms_sans_serif-1251-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1251 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1251 96 129 8 ms_sans_serif-1253-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1253 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1253 96 129 5 ms_sans_serif-1253-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1253 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1253 96 129 7 ms_sans_serif-1253-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1253 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1253 96 129 8 ms_sans_serif-1254-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1254 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1254 96 129 5 ms_sans_serif-1254-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1254 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1254 96 129 7 ms_sans_serif-1254-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1254 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1254 96 129 8 ms_sans_serif-1255-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1255 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1255 96 129 5 ms_sans_serif-1255-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1255 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1255 96 129 7 ms_sans_serif-1255-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1255 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1255 96 129 8 ms_sans_serif-1256-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1256 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1256 96 129 5 ms_sans_serif-1256-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1256 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1256 96 129 7 ms_sans_serif-1256-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1256 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1256 96 129 8 ms_sans_serif-1257-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 1257 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 1257 96 129 5 ms_sans_serif-1257-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1257 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 1257 96 129 7 ms_sans_serif-1257-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 1257 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 1257 96 129 8 ms_sans_serif-874-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 13 874 96 129 5 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 13 874 96 129 5 ms_sans_serif-874-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 874 96 129 7 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 16 874 96 129 7 ms_sans_serif-874-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 20 874 96 129 8 + $(LDPATH) $(SFNT2FNT) ms_sans_serif.ttf 20 874 96 129 8 small_fonts-1252-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1252 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1252 96 128 5 small_fonts-1250-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1250 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1250 96 128 5 small_fonts-1251-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1251 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1251 96 128 5 small_fonts-1253-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1253 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1253 96 128 5 small_fonts-1254-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1254 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1254 96 128 5 small_fonts-1255-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1255 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1255 96 128 5 small_fonts-1256-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1256 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1256 96 128 5 small_fonts-1257-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 1257 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 1257 96 128 5 small_fonts-932-96-11.fnt: small_fonts.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 11 932 96 128 5 + $(LDPATH) $(SFNT2FNT) small_fonts.ttf 11 932 96 128 5 system-1252-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1252 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1252 96 128 7 system-1250-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1250 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1250 96 128 7 system-1251-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1251 96 128 7 system-1253-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1253 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1253 96 128 7 system-1254-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1254 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1254 96 128 7 system-1255-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1255 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1255 96 128 7 system-1256-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1256 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1256 96 128 7 system-1257-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 1257 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 1257 96 128 7 system-874-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 874 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 874 96 128 7 system-932-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 932 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 932 96 128 7 system-936-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 936 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 936 96 128 7 system-949-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 949 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 949 96 128 7 system-950-96-16.fnt: system.ttf $(SFNT2FNT) - $(LDPATH) $(SFNT2FNT) $< 16 950 96 128 7 + $(LDPATH) $(SFNT2FNT) system.ttf 16 950 96 128 7 coure.fon: courier-1252-96-13.fnt $(FNT2FON) $(FNT2FON) courier-1252-96-13.fnt $@

1 0

Alexandre Julliard : makedep: Support for new naming scheme for lex files.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 560c9ee785edaf0093e4f3518f51526dbcf0faeb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=560c9ee785edaf0093e4f35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 13:16:59 2006 +0200 makedep: Support for new naming scheme for lex files. --- tools/Makefile.in | 1 - tools/makedep.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.in b/tools/Makefile.in index 7878635..e37bbdb 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,3 @@ -DEFS = -DLEX_OUTPUT_ROOT="\"@LEX_OUTPUT_ROOT@\"" TOPSRCDIR = @top_srcdir@ TOPOBJDIR = .. SRCDIR = @srcdir@ diff --git a/tools/makedep.c b/tools/makedep.c index 0b9fa67..71c0032 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -553,7 +553,7 @@ static void output_src( FILE *file, INCL } else if (!strcmp( ext, "l" )) /* lex file */ { - *column += fprintf( file, "%s.o: %s.c", LEX_OUTPUT_ROOT, LEX_OUTPUT_ROOT ); + *column += fprintf( file, "%s.yy.o: %s.yy.c", obj, obj ); } else if (!strcmp( ext, "rc" )) /* resource file */ {

1 0

Alexandre Julliard : winedbg: Allow building without debug support in the parser.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: dfd1abfa5755fc8d58947eed16d5d2d1ddffb69f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=dfd1abfa5755fc8d58947ee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:26:35 2006 +0200 winedbg: Allow building without debug support in the parser. --- programs/winedbg/dbg.y | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/dbg.y b/programs/winedbg/dbg.y index 4601f0a..b7d83d8 100644 --- a/programs/winedbg/dbg.y +++ b/programs/winedbg/dbg.y @@ -24,6 +24,7 @@ #include "config.h" #include "wine/port.h" +#include <stdio.h> #include <stdlib.h> #include <string.h> #ifdef HAVE_UNISTD_H @@ -509,10 +510,6 @@ void parser_handle(HANDLE input) HANDLE in_copy = dbg_parser_input; HANDLE out_copy = dbg_parser_output; -#ifdef YYDEBUG - yydebug = 0; -#endif - ret_ok = FALSE; if (input != INVALID_HANDLE_VALUE)

1 0

Alexandre Julliard : makefiles: Add global rules for bison and lex files.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 9c085cba0a33e1e53f522133805804c2d4f570f2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9c085cba0a33e1e53f52213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 13:16:22 2006 +0200 makefiles: Add global rules for bison and lex files. Also build the .c and .h files separately to allow parallel makes. --- .gitignore | 2 +- Make.rules.in | 19 +++++++++++++++---- dlls/msi/Makefile.in | 23 +++++++---------------- libs/wpp/Makefile.in | 19 +++++-------------- programs/winedbg/Makefile.in | 19 +++++-------------- programs/winhelp/Makefile.in | 8 +++----- tools/widl/Makefile.in | 19 +++++-------------- tools/wmc/Makefile.in | 15 ++++----------- tools/wrc/Makefile.in | 19 +++++-------------- 9 files changed, 50 insertions(+), 93 deletions(-) diff --git a/.gitignore b/.gitignore index 2bbaa52..1d75513 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.so *.tab.[ch] *.tlb +*.yy.c *_[cips].c *~ /Make.rules @@ -21,4 +22,3 @@ /tags /wine Makefile -lex.yy.c diff --git a/Make.rules.in b/Make.rules.in index 0f53804..1d3f4c3 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -109,16 +109,16 @@ prog_manext = 1 api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ - *.flc *.res *.mc.rc *.tab.[ch] @LEX_OUTPUT_ROOT(a).c core + *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS) RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) # Implicit rules -.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c +.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -126,6 +126,15 @@ # Implicit rules .s.o: $(AS) -o $@ $< +.y.tab.c: + $(BISON) $(BISONFLAGS) -o $@ $< + +.y.tab.h: + $(BISON) $(BISONFLAGS) --defines=$@ -o /dev/null $< + +.l.yy.c: + $(LEX) $(LEXFLAGS) -t $< >$@ || ($(RM) $@ && exit 1) + .mc.mc.rc: $(LDPATH) $(WMC) -i -U -H /dev/null -o $@ $< @@ -212,11 +221,13 @@ winapi_check:: dummy # Rules for dependencies +DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS) + $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend depend: $(IDL_SRCS:.idl=.h) $(SUBDIRS:%=%/__depend__) - $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_SRCS) $(EXTRA_SRCS) + $(MAKEDEP) -C$(SRCDIR) -S$(TOPSRCDIR) -T$(TOPOBJDIR) $(EXTRAINCL) $(DEPEND_SRCS) .PHONY: depend $(SUBDIRS:%=%/__depend__) diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in index 47728e0..3bd3783 100644 --- a/dlls/msi/Makefile.in +++ b/dlls/msi/Makefile.in @@ -45,6 +45,10 @@ C_SRCS = \ upgrade.c \ where.c +BISON_SRCS = \ + cond.y \ + sql.y + RC_SRCS = msi.rc RC_BINSRC = msi.rc RC_BINARIES = \ @@ -52,23 +56,10 @@ RC_BINARIES = \ instadvert.bmp \ instlocal.bmp -EXTRA_SRCS = sql.y cond.y -EXTRA_OBJS = sql.tab.o cond.tab.o - @MAKE_DLL_RULES@ -sql.tab.c sql.tab.h: sql.y - $(BISON) -d $(SRCDIR)/sql.y -o sql.tab.c - -cond.tab.c cond.tab.h: cond.y - $(BISON) -d $(SRCDIR)/cond.y -o cond.tab.c - -# hack to allow parallel make -sql.tab.h: sql.tab.c -sql.tab.o: sql.tab.h -cond.tab.h: cond.tab.c -cond.tab.o: cond.tab.h +### Dependencies: +cond.tab.o: cond.tab.c +sql.tab.o: sql.tab.c tokenize.o: sql.tab.h - -### Dependencies: diff --git a/libs/wpp/Makefile.in b/libs/wpp/Makefile.in index 9d501e9..ff6744c 100644 --- a/libs/wpp/Makefile.in +++ b/libs/wpp/Makefile.in @@ -8,8 +8,8 @@ C_SRCS = \ preproc.c \ wpp.c -EXTRA_SRCS = ppy.y ppl.l -EXTRA_OBJS = ppy.tab.o @LEX_OUTPUT_ROOT(a).o +LEX_SRCS = ppl.l +BISON_SRCS = ppy.y all: $(MODULE) @@ -20,16 +20,7 @@ all: $(MODULE) $(AR) $@ $(OBJS) $(RANLIB) $@ -ppy.tab.c ppy.tab.h: ppy.y - $(BISON) -d $(SRCDIR)/ppy.y -o ppy.tab.c - -# hack to allow parallel make -ppy.tab.h: ppy.tab.c -ppy.tab.o: ppy.tab.h - -(a)LEX_OUTPUT_ROOT@.c: ppl.l - $(LEX) -o$@ $(SRCDIR)/ppl.l - -(a)LEX_OUTPUT_ROOT@.o: ppy.tab.h - ### Dependencies: + +ppy.tab.o: ppy.tab.c +ppl.yy.o: ppl.yy.c ppy.tab.h diff --git a/programs/winedbg/Makefile.in b/programs/winedbg/Makefile.in index 6c2274b..35a96d0 100644 --- a/programs/winedbg/Makefile.in +++ b/programs/winedbg/Makefile.in @@ -28,8 +28,8 @@ C_SRCS = \ types.c \ winedbg.c -EXTRA_SRCS = dbg.y debug.l -EXTRA_OBJS = dbg.tab.o @LEX_OUTPUT_ROOT(a).o +LEX_SRCS = debug.l +BISON_SRCS = dbg.y MANPAGES = winedbg.man @@ -37,18 +37,6 @@ MANPAGES = winedbg.man all: $(MANPAGES) -dbg.tab.c dbg.tab.h: dbg.y - $(BISON) -d -t $(SRCDIR)/dbg.y -o dbg.tab.c - -# hack to allow parallel make -dbg.tab.h: dbg.tab.c -dbg.tab.o: dbg.tab.h - -(a)LEX_OUTPUT_ROOT@.c: debug.l - $(LEX) $(SRCDIR)/debug.l - -(a)LEX_OUTPUT_ROOT@.o: dbg.tab.h - install:: $(MANPAGES) $(DESTDIR)$(mandir)/man$(prog_manext) $(INSTALL_DATA) winedbg.man $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) @@ -56,3 +44,6 @@ uninstall:: $(RM) $(DESTDIR)$(mandir)/man$(prog_manext)/winedbg.$(prog_manext) ### Dependencies: + +dbg.tab.o: dbg.tab.c +debug.yy.o: debug.yy.c dbg.tab.h diff --git a/programs/winhelp/Makefile.in b/programs/winhelp/Makefile.in index 3d6c5b0..f5cf11b 100644 --- a/programs/winhelp/Makefile.in +++ b/programs/winhelp/Makefile.in @@ -13,8 +13,7 @@ C_SRCS = \ string.c \ winhelp.c -EXTRA_SRCS = macro.lex.l -EXTRA_OBJS = @LEX_OUTPUT_ROOT(a).o +LEX_SRCS = macro.lex.l EXTRARCFLAGS = -DWINELIB @@ -22,7 +21,6 @@ RC_SRCS = rsrc.rc @MAKE_PROG_RULES@ -(a)LEX_OUTPUT_ROOT@.c: macro.lex.l - $(LEX) $(SRCDIR)/macro.lex.l - ### Dependencies: + +macro.lex.yy.o: macro.lex.yy.c diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in index 8d7861b..a2afefc 100644 --- a/tools/widl/Makefile.in +++ b/tools/widl/Makefile.in @@ -20,8 +20,8 @@ C_SRCS = \ widl.c \ write_msft.c -EXTRA_SRCS = parser.y parser.l -EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT(a).o +LEX_SRCS = parser.l +BISON_SRCS = parser.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -32,18 +32,6 @@ all: $(PROGRAMS) $(MANPAGES) widl$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBPORT) $(LEXLIB) $(LDFLAGS) -parser.tab.c parser.tab.h: parser.y - $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c - -# hack to allow parallel make -parser.tab.h: parser.tab.c -parser.tab.o: parser.tab.h - -(a)LEX_OUTPUT_ROOT@.c: parser.l - $(LEX) $(SRCDIR)/parser.l - -(a)LEX_OUTPUT_ROOT@.o: parser.tab.h - install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_PROGRAM) widl$(EXEEXT) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(INSTALL_DATA) widl.man $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) @@ -52,3 +40,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/widl$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/widl.$(prog_manext) ### Dependencies: + +parser.tab.o: parser.tab.c +parser.yy.o: parser.yy.c parser.tab.h diff --git a/tools/wmc/Makefile.in b/tools/wmc/Makefile.in index 5c99710..a9b05b8 100644 --- a/tools/wmc/Makefile.in +++ b/tools/wmc/Makefile.in @@ -15,27 +15,17 @@ C_SRCS = \ wmc.c \ write.c -EXTRA_SRCS = mcy.y -EXTRA_OBJS = mcy.tab.o +BISON_SRCS = mcy.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) all: $(PROGRAMS) $(MANPAGES) -mcl.o: mcy.tab.h - @MAKE_RULES@ wmc$(EXEEXT): $(OBJS) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LEXLIB) $(LDFLAGS) -mcy.tab.c mcy.tab.h: mcy.y - $(BISON) -d -t $(SRCDIR)/mcy.y -o mcy.tab.c - -# hack to allow parallel make -mcy.tab.h: mcy.tab.c -mcy.tab.o: mcy.tab.h - install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) wmc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) $(INSTALL_PROGRAM) wmc$(EXEEXT) $(DESTDIR)$(bindir)/wmc$(EXEEXT) @@ -44,3 +34,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/wmc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wmc.$(prog_manext) ### Dependencies: + +mcy.tab.o: mcy.tab.c +mcl.o: mcy.tab.h diff --git a/tools/wrc/Makefile.in b/tools/wrc/Makefile.in index dd2ca82..382f089 100644 --- a/tools/wrc/Makefile.in +++ b/tools/wrc/Makefile.in @@ -19,8 +19,8 @@ C_SRCS = \ wrc.c \ writeres.c -EXTRA_SRCS = parser.y parser.l -EXTRA_OBJS = parser.tab.o @LEX_OUTPUT_ROOT(a).o +LEX_SRCS = parser.l +BISON_SRCS = parser.y INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man$(prog_manext) @@ -31,18 +31,6 @@ all: $(PROGRAMS) $(MANPAGES) wrc$(EXEEXT): $(OBJS) $(LIBWPP) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBWPP) $(LIBWINE_LDFLAGS) $(LIBPORT) $(LEXLIB) $(LDFLAGS) -parser.tab.c parser.tab.h: parser.y - $(BISON) -d -t $(SRCDIR)/parser.y -o parser.tab.c - -# hack to allow parallel make -parser.tab.h: parser.tab.c -parser.tab.o: parser.tab.h - -(a)LEX_OUTPUT_ROOT@.c: parser.l - $(LEX) $(SRCDIR)/parser.l - -(a)LEX_OUTPUT_ROOT@.o: parser.tab.h - install:: $(PROGRAMS) $(MANPAGES) $(INSTALLDIRS) $(INSTALL_DATA) wrc.man $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) $(INSTALL_PROGRAM) wrc$(EXEEXT) $(DESTDIR)$(bindir)/wrc$(EXEEXT) @@ -51,3 +39,6 @@ uninstall:: $(RM) $(DESTDIR)$(bindir)/wrc$(EXEEXT) $(DESTDIR)$(mandir)/man$(prog_manext)/wrc.$(prog_manext) ### Dependencies: + +parser.tab.o: parser.tab.c +parser.yy.o: parser.yy.c parser.tab.h

1 0

Alexandre Julliard : wmc: Allow building without debug support in the parser.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: cc44aa99b492b150eadd827e6d1229681424874b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cc44aa99b492b150eadd827… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:26:24 2006 +0200 wmc: Allow building without debug support in the parser. --- tools/wmc/wmc.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wmc/wmc.c b/tools/wmc/wmc.c index 858606f..4dd9889 100644 --- a/tools/wmc/wmc.c +++ b/tools/wmc/wmc.c @@ -113,6 +113,8 @@ int char_number = 1; /* The current cha char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wmc */ +int yydebug; + int getopt (int argc, char *const *argv, const char *optstring); static void segvhandler(int sig);

1 0

Alexandre Julliard : wrc: Allow building without debug support in the parser.
by Alexandre Julliard Sept. 10, 2006

Sept. 10, 2006

Module: wine Branch: master Commit: 050c8942d1b548f4cfc36d7b9b8259be79bdc600 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=050c8942d1b548f4cfc36d7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 9 11:26:29 2006 +0200 wrc: Allow building without debug support in the parser. --- tools/wrc/wrc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 7b71361..fd284aa 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -166,7 +166,7 @@ int char_number = 1; /* The current cha char *cmdline; /* The entire commandline */ time_t now; /* The time of start of wrc */ -int yy_flex_debug; +int yydebug, yy_flex_debug; resource_t *resource_top; /* The top of the parsed resources */

1 0