Alexandre Julliard : Make.rules: Added support for building IDL client/ proxy/server/iid files.
Module: wine Branch: master Commit: 12c196203c0c60d6647ab655043d913e14d2e611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c196203c0c60d6647ab65504... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 16 17:20:37 2006 +0200 Make.rules: Added support for building IDL client/proxy/server/iid files. --- Make.rules.in | 16 +++++----------- configure | 3 ++- configure.ac | 6 ++++-- dlls/atl/Makefile.in | 2 +- dlls/mshtml/Makefile.in | 2 +- dlls/ole32/Makefile.in | 2 +- include/Makefile.in | 4 ++-- 7 files changed, 16 insertions(+), 19 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index 9e7ec07..86a40ba 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -111,7 +111,8 @@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS) +IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) +OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) @@ -215,7 +216,7 @@ 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) +DEPEND_SRCS = $(C_SRCS) $(C_SRCS16) $(RC_SRCS) $(RC_SRCS16) $(MC_SRCS) $(IDL_H_SRCS) $(IDL_GEN_C_SRCS) $(BISON_SRCS) $(LEX_SRCS) $(EXTRA_SRCS) $(SUBDIRS:%=%/__depend__): dummy @cd `dirname $@` && $(MAKE) depend @@ -234,7 +235,7 @@ # Rules for cleaning -cd `dirname $@` && $(RM) $(CLEAN_FILES) clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) - $(RM) $(CLEAN_FILES) $(IDL_SRCS:.idl=.h) $(IDL_SRCS:.idl=_c.c) $(IDL_SRCS:.idl=_i.c) $(IDL_SRCS:.idl=_p.c) $(IDL_SRCS:.idl=_s.c) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) + $(RM) $(CLEAN_FILES) $(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(PROGRAMS) $(RC_BINARIES) $(MANPAGES) .PHONY: clean $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__) @@ -303,14 +304,7 @@ # Misc. rules $(MC_SRCS:.mc=.mc.rc): $(WMC) -$(IDL_SRCS:.idl=.h): $(WIDL) - -$(IDL_SRCS:.idl=_c.c): $(WIDL) -$(IDL_SRCS:.idl=_i.c): $(WIDL) -$(IDL_SRCS:.idl=_p.c): $(WIDL) -$(IDL_SRCS:.idl=_s.c): $(WIDL) - -$(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) +$(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/configure b/configure index 3ea21f2..431e36b 100755 --- a/configure +++ b/configure @@ -23666,7 +23666,8 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 84fdf0d..b9a5b24 100644 --- a/configure.ac +++ b/configure.ac @@ -1453,7 +1453,8 @@ AC_SUBST(DEPENDENCIES,m4_if(m4_version_c Makefile: dummy\\ -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ \\ -\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h)\\ +\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h)\\ +\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], ["### Dependencies: @@ -1463,7 +1464,8 @@ Makefile: dummy\\ Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"])) diff --git a/dlls/atl/Makefile.in b/dlls/atl/Makefile.in index cd4de31..e54cf64 100644 --- a/dlls/atl/Makefile.in +++ b/dlls/atl/Makefile.in @@ -13,7 +13,7 @@ C_SRCS = \ RC_SRCS = rsrc.rc -IDL_SRCS = \ +IDL_H_SRCS = \ atliface.idl @MAKE_DLL_RULES@ diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index b3009b1..de649e0 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -41,7 +41,7 @@ C_SRCS = \ RC_SRCS = rsrc.rc -IDL_SRCS = nsiface.idl +IDL_H_SRCS = nsiface.idl @MAKE_DLL_RULES@ diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index 511ee49..6779695 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -68,7 +68,7 @@ RC_BINARIES = \ drag_move.cur \ nodrop.cur -IDL_SRCS = \ +IDL_H_SRCS = \ dcom.idl @MAKE_DLL_RULES@ diff --git a/include/Makefile.in b/include/Makefile.in index 4b959bc..f0f3d52 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -377,7 +377,7 @@ WINE_INCLUDES = \ library.h \ unicode.h -IDL_SRCS = $(WINDOWS_IDL_SRCS) $(WINE_IDL_SRCS:%=wine/%) +IDL_H_SRCS = $(WINDOWS_IDL_SRCS) $(WINE_IDL_SRCS:%=wine/%) EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine @@ -392,7 +392,7 @@ INSTALLDIRS = \ WINDOWS_IDL_HEADERS = $(WINDOWS_IDL_SRCS:.idl=.h) WINE_IDL_HEADERS = $(WINE_IDL_SRCS:.idl=.h) -IDL_HEADERS = $(IDL_SRCS:.idl=.h) +IDL_HEADERS = $(IDL_H_SRCS:.idl=.h) IDL_TLBS = $(IDL_TLB_SRCS:.idl=.tlb) all: $(IDL_HEADERS) $(IDL_TLBS)
participants (1)
-
Alexandre Julliard