diff --git a/.gitignore b/.gitignore index 8a77f70881c..8ce12fe7ee7 100644 --- a/.gitignore +++ b/.gitignore @@ -53,12 +53,8 @@ dlls/d3dcompiler_43/asmshader.yy.c dlls/dispex/disp_ex.h dlls/dispex/disp_ex_p.c dlls/dxdiagn/fil_data.h -dlls/gameux/gameux_tlb.tlb -dlls/hhctrl.ocx/hhctrl_tlb.tlb -dlls/ieframe/ieframe_v1.tlb dlls/infosoft/infosoft.h dlls/jscript/jscript_classes.h -dlls/jscript/jsglobal.tlb dlls/jscript/parser.tab.c dlls/jscript/parser.tab.h dlls/libd3dcompiler.def @@ -70,25 +66,18 @@ dlls/msdaps/msdaps.h dlls/msdaps/msdaps_p.c dlls/msdaps/row_server.h dlls/msdaps/row_server_p.c -dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h dlls/msi/cond.tab.c dlls/msi/cond.tab.h dlls/msi/msiserver.h -dlls/msi/msiserver.tlb dlls/msi/msiserver_i.c dlls/msi/sql.tab.c dlls/msi/sql.tab.h dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c -dlls/msxml/msxml_tlb.tlb -dlls/msxml2/msxml2_tlb.tlb -dlls/msxml3/msxml3_v1.tlb dlls/msxml3/xslpattern.tab.c dlls/msxml3/xslpattern.tab.h dlls/msxml3/xslpattern.yy.c -dlls/msxml4/msxml4_tlb.tlb -dlls/msxml6/msxml6_tlb.tlb dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h @@ -114,7 +103,6 @@ dlls/oledb32/convert.h dlls/oledb32/convert_i.c dlls/oledb32/tests/convert.h dlls/oledb32/tests/convert_i.c -dlls/pstorec/pstorec_tlb.tlb dlls/qmgr/qmgr_local.h dlls/qmgr/qmgr_local_i.c dlls/qmgrprxy/qmgrprxy.h @@ -127,11 +115,7 @@ dlls/rpcrt4/epm_c.c dlls/rpcrt4/tests/server.h dlls/rpcrt4/tests/server_c.c dlls/rpcrt4/tests/server_s.c -dlls/shdocvw/shdocvw_v1.tlb dlls/shell32/AUTHORS -dlls/shell32/shell32_tlb.tlb -dlls/stdole2.tlb/std_ole_v2.tlb -dlls/stdole32.tlb/std_ole_v1.tlb dlls/sti/sti_wia.h dlls/sti/sti_wia_p.c dlls/urlmon/urlmon_urlmon.h @@ -139,8 +123,6 @@ dlls/urlmon/urlmon_urlmon_p.c dlls/vbscript/vbscript_classes.h dlls/windowscodecs/windowscodecs_wincodec.h dlls/windowscodecs/windowscodecs_wincodec_p.c -dlls/winhttp/winhttp_tlb.tlb -dlls/wuapi/wuapi_tlb.tlb include/activaut.h include/activdbg.h include/activscp.h diff --git a/Make.rules.in b/Make.rules.in index bd2013cfba2..c3409ac1fa2 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -30,7 +30,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $ $(PO_SRCS:%=rsrc.pot) $(MC_SRCS:%=msg.pot) $(XTEMPLATE_SRCS:.x=.h) OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) \ - $(IDL_R_SRCS:.idl=_r.res) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) + $(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS) CROSSOBJS = $(OBJS:.o=.cross.o) LINTS = $(C_SRCS:.c=.ln) @@ -42,7 +42,7 @@ filter: dummy # Implicit rules -.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp +.SUFFIXES: .mc .rc .res .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .man.in .man _c.c _i.c _p.c _s.c _r.res _t.res .cross.o @MAINTAINER_MODE@ .sfd .ttf .svg .ico .bmp .c.o: $(CC) -c $(ALLCFLAGS) -o $@ $< @@ -86,6 +86,9 @@ filter: dummy .idl.tlb: $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< +.idl_t.res: + $(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $< + .c.ln: $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 ) @@ -191,7 +194,7 @@ $(PO_SRCS:.rc=.res): $(ALL_PO_FILES) # Misc. rules -$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) +$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL) dummy: diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 52e006e6cf1..56414a09874 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -12,6 +12,7 @@ DEFS = -D__WINESRC__ $(EXTRADEFS) BASEMODULE = $(MODULE:%.dll=%) MAINSPEC = $(BASEMODULE).spec ALL_LIBS = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS) +IDL_TLB_RES = $(IDL_TLB_SRCS:.idl=_t.res) IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPLIBFLAGS = $(TARGETFLAGS) $(EXTRAIMPLIBFLAGS) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) diff --git a/dlls/gameux/rsrc.rc b/dlls/gameux/rsrc.rc index f5670b78e8c..f5d1fe5c235 100644 --- a/dlls/gameux/rsrc.rc +++ b/dlls/gameux/rsrc.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: gameux_tlb.tlb */ -1 TYPELIB gameux_tlb.tlb - #define WINE_FILEDESCRIPTION_STR "Wine Games Explorer" #define WINE_FILENAME_STR "gameux.dll" #define WINE_FILEVERSION 6,1,7600,16385 diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index 1cf654ca74b..4b4eaf11348 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -79,9 +79,6 @@ MENU_POPUP MENU LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -/* @makedep: hhctrl_tlb.tlb */ -1 TYPELIB hhctrl_tlb.tlb - #define WINE_FILEDESCRIPTION_STR "Wine htmlhelp OCX" #define WINE_FILENAME_STR "hhctrl.ocx" #define WINE_FILEVERSION 5,2,3790,2744 diff --git a/dlls/ieframe/ieframe.rc b/dlls/ieframe/ieframe.rc index 13b6a5f1ac1..e1abda0dc0f 100644 --- a/dlls/ieframe/ieframe.rc +++ b/dlls/ieframe/ieframe.rc @@ -85,9 +85,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" -/* @makedep: ieframe_v1.tlb */ -1 TYPELIB ieframe_v1.tlb - /* @makedep: ietoolbar.bmp */ IDB_IETOOLBAR BITMAP ietoolbar.bmp diff --git a/dlls/jscript/jscript.rc b/dlls/jscript/jscript.rc index 8717cf502a9..17612cca57e 100644 --- a/dlls/jscript/jscript.rc +++ b/dlls/jscript/jscript.rc @@ -54,6 +54,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* @makedep: jscript.rgs */ 2 WINE_REGISTRY jscript.rgs - -/* @makedep: jsglobal.tlb */ -1 TYPELIB jsglobal.tlb diff --git a/dlls/mshtml.tlb/Makefile.in b/dlls/mshtml.tlb/Makefile.in index 15952dae122..3215cbc0816 100644 --- a/dlls/mshtml.tlb/Makefile.in +++ b/dlls/mshtml.tlb/Makefile.in @@ -1,6 +1,5 @@ MODULE = mshtml.tlb -RC_SRCS = rsrc.rc IDL_TLB_SRCS = mshtml_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/mshtml.tlb/rsrc.rc b/dlls/mshtml.tlb/rsrc.rc deleted file mode 100644 index 75c8549d5cc..00000000000 --- a/dlls/mshtml.tlb/rsrc.rc +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2007 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* @makedep: mshtml_tlb.tlb */ -1 TYPELIB mshtml_tlb.tlb diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index c980fa891d2..20c7795d514 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -63,9 +63,6 @@ STRINGTABLE LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -/* @makedep: msiserver.tlb */ -1 TYPELIB msiserver.tlb - /* @makedep: msiserver.rgs */ 1 WINE_REGISTRY msiserver.rgs diff --git a/dlls/msxml/rsrc.rc b/dlls/msxml/rsrc.rc index 473a32445c4..da01c918433 100644 --- a/dlls/msxml/rsrc.rc +++ b/dlls/msxml/rsrc.rc @@ -18,8 +18,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msxml_tlb.tlb */ -1 TYPELIB msxml_tlb.tlb - /* @makedep: msxml.rgs */ 1 WINE_REGISTRY msxml.rgs diff --git a/dlls/msxml2/Makefile.in b/dlls/msxml2/Makefile.in index 263274cdfce..7db4c7bab07 100644 --- a/dlls/msxml2/Makefile.in +++ b/dlls/msxml2/Makefile.in @@ -5,6 +5,4 @@ C_SRCS = main.c IDL_TLB_SRCS = msxml2_tlb.idl IDL_R_SRCS = msxml2_tlb.idl -RC_SRCS = rsrc.rc - @MAKE_DLL_RULES@ diff --git a/dlls/msxml2/rsrc.rc b/dlls/msxml2/rsrc.rc deleted file mode 100644 index 087bec1a38b..00000000000 --- a/dlls/msxml2/rsrc.rc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Resources for msxml2 - * - * Copyright 2010 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* @makedep: msxml2_tlb.tlb */ -1 TYPELIB msxml2_tlb.tlb diff --git a/dlls/msxml3/version.rc b/dlls/msxml3/version.rc index bcd51051b72..21acf1b9d0f 100644 --- a/dlls/msxml3/version.rc +++ b/dlls/msxml3/version.rc @@ -14,9 +14,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msxml3_v1.tlb */ -1 TYPELIB msxml3_v1.tlb - #define WINE_FILEDESCRIPTION_STR "Wine MSXML 3.0" #define WINE_FILENAME_STR "msxml3.dll" #define WINE_FILEVERSION 8,90,1101,0 diff --git a/dlls/msxml4/rsrc.rc b/dlls/msxml4/rsrc.rc index 4ca1abbb5b2..82c0efea44a 100644 --- a/dlls/msxml4/rsrc.rc +++ b/dlls/msxml4/rsrc.rc @@ -18,9 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msxml4_tlb.tlb */ -1 TYPELIB msxml4_tlb.tlb - #define WINE_FILEDESCRIPTION_STR "Wine MSXML 4.0" #define WINE_FILENAME_STR "msxml4.dll" #define WINE_FILEVERSION 4,20,9818,0 diff --git a/dlls/msxml6/rsrc.rc b/dlls/msxml6/rsrc.rc index a8b917fb506..6b413c36d68 100644 --- a/dlls/msxml6/rsrc.rc +++ b/dlls/msxml6/rsrc.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: msxml6_tlb.tlb */ -1 TYPELIB msxml6_tlb.tlb - #define WINE_FILEDESCRIPTION_STR "Wine MSXML 6.0" #define WINE_FILENAME_STR "msxml6.dll" #define WINE_FILEVERSION 6,10,1129,0 diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index af25d51e158..749fe8b2093 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = uuid C_SRCS = \ pstorec.c -RC_SRCS = rsrc.rc - IDL_TLB_SRCS = pstorec_tlb.idl @MAKE_DLL_RULES@ diff --git a/dlls/pstorec/rsrc.rc b/dlls/pstorec/rsrc.rc deleted file mode 100644 index 80dc7816e8f..00000000000 --- a/dlls/pstorec/rsrc.rc +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Resource file for pstorec - * - * Copyright 2009 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "winnls.h" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -/* @makedep: pstorec_tlb.tlb */ -1 TYPELIB pstorec_tlb.tlb diff --git a/dlls/shdocvw/shdocvw.rc b/dlls/shdocvw/shdocvw.rc index 0c7dd7a076a..a299d9af8d5 100644 --- a/dlls/shdocvw/shdocvw.rc +++ b/dlls/shdocvw/shdocvw.rc @@ -29,6 +29,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_EXTRAVALUES VALUE "OLESelfRegister","" #include "wine/wine_common_ver.rc" - -/* @makedep: shdocvw_v1.tlb */ -1 TYPELIB shdocvw_v1.tlb diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 2ba5b3fd6d1..eae541dc0ab 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -279,9 +279,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -/* @makedep: shell32_tlb.tlb */ -1 TYPELIB shell32_tlb.tlb - /* @makedep: shell32.rgs */ 1 WINE_REGISTRY shell32.rgs diff --git a/dlls/stdole2.tlb/rsrc.rc b/dlls/stdole2.tlb/rsrc.rc index d50667f2378..3f0ca3f2e00 100644 --- a/dlls/stdole2.tlb/rsrc.rc +++ b/dlls/stdole2.tlb/rsrc.rc @@ -26,6 +26,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" - -/* @makedep: std_ole_v2.tlb */ -1 TYPELIB std_ole_v2.tlb diff --git a/dlls/stdole32.tlb/rsrc.rc b/dlls/stdole32.tlb/rsrc.rc index d75d804b0b7..4c4d251450a 100644 --- a/dlls/stdole32.tlb/rsrc.rc +++ b/dlls/stdole32.tlb/rsrc.rc @@ -26,6 +26,3 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "wine/wine_common_ver.rc" - -/* @makedep: std_ole_v1.tlb */ -1 TYPELIB std_ole_v1.tlb diff --git a/dlls/winhttp/version.rc b/dlls/winhttp/version.rc index 170ba38c425..3dca59ff3a9 100644 --- a/dlls/winhttp/version.rc +++ b/dlls/winhttp/version.rc @@ -16,9 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -/* @makedep: winhttp_tlb.tlb */ -1 TYPELIB winhttp_tlb.tlb - #define WINE_FILEDESCRIPTION_STR "Wine HTTP Library" #define WINE_FILENAME_STR "winhttp.dll" #define WINE_FILEVERSION_MAJOR 5 diff --git a/dlls/wuapi/Makefile.in b/dlls/wuapi/Makefile.in index 629a79e3310..3f748a053d2 100644 --- a/dlls/wuapi/Makefile.in +++ b/dlls/wuapi/Makefile.in @@ -13,6 +13,4 @@ C_SRCS = \ IDL_TLB_SRCS = wuapi_tlb.idl IDL_R_SRCS = wuapi_tlb.idl -RC_SRCS = rsrc.rc - @MAKE_DLL_RULES@ diff --git a/dlls/wuapi/rsrc.rc b/dlls/wuapi/rsrc.rc deleted file mode 100644 index 9ddce3ba509..00000000000 --- a/dlls/wuapi/rsrc.rc +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Resources for wuapi - * - * Copyright 2010 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -/* @makedep: wuapi_tlb.tlb */ -1 TYPELIB wuapi_tlb.tlb diff --git a/tools/make_makefiles b/tools/make_makefiles index 487407d3667..3a27cf08a40 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -531,6 +531,7 @@ sub update_ignores(@) { my @pattern = @{$src}; next unless defined $makefile{$pattern[0]}; + next if $pattern[0] eq "IDL_TLB_SRCS" && $makefile{"=rules"} eq "dlls/Makedll.rules"; push @list, map { (my $ret = $_) =~ s/$pattern[1]$/$pattern[2]/; $ret; } @{$makefile{$pattern[0]}}; } foreach my $f (@list) diff --git a/tools/makedep.c b/tools/makedep.c index 7818a2e413e..799c6e0a19f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -890,7 +890,7 @@ static int output_src( FILE *file, INCL_FILE *pFile, int *column ) const char *suffix = "cips"; name = strmake( "%s.tlb", obj ); - if (find_src_file( name )) *column += fprintf( file, "%s", name ); + if (find_src_file( name )) *column += fprintf( file, "%s %s_t.res", name, obj ); else { got_header = 1;