Build idl files as part of the normal build process.

Make.rules.in

@@ -113,7 +113,7 @@ LINTS  = $(C_SRCS:.c=.ln)
 
 # Implicit rules
 
-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .ok .sfd .ttf
+.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.c .spec.def .idl .h .ok .sfd .ttf
 
 .c.o:
 	$(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -136,6 +136,9 @@ LINTS  = $(C_SRCS:.c=.ln)
 .spec.spec.def:
 	$(WINEBUILD) -w $(DEFS) -o $@ --def $<
 
+.idl.h:
+	$(WIDL) $(IDLFLAGS) -b -h -H $@ $<
+
 .c.ln:
 	$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
 
@@ -225,17 +228,6 @@ clean:: $(SUBDIRS:%=%/__clean__) $(EXTRASUBDIRS:%=%/__clean__)
 
 .PHONY: clean testclean $(SUBDIRS:%=%/__clean__) $(SUBDIRS:%=%/__testclean__) $(EXTRASUBDIRS:%=%/__clean__)
 
-# Rules for IDL files
-
-idl: $(SUBDIRS:%=%/__idl__)
-
-$(IDL_SRCS:.idl=.h): $(WIDL)
-
-$(SUBDIRS:%=%/__idl__): dummy
-	cd `dirname $@` && $(MAKE) idl
-
-.PHONY: idl
-
 # Rules for installing
 
 $(SUBDIRS:%=%/__install__): dummy
@@ -279,6 +271,8 @@ $(SUBDIRS:%=%/__crosstest__): dummy
 
 $(MC_SRCS:.mc=.mc.rc): $(WMC)
 
+$(IDL_SRCS:.idl=.h): $(WIDL)
+
 $(SUBDIRS): dummy
 	@cd $@ && $(MAKE)
 

Makefile.in

@@ -108,14 +108,17 @@ uninstall:: $(INSTALLBOTHSUBDIRS:%=%/__uninstall__)
 # Dependencies between directories
 
 all: $(INSTALLSUBDIRS) $(INSTALLBOTHSUBDIRS)
-dlls fonts loader server: libs tools
-programs: dlls libs tools
+dlls: include libs tools
+fonts loader server: libs tools
+programs: dlls include libs tools
+include: libs tools
 tools: libs
 
-dlls/__install-lib__ dlls/__install-dev__: libs tools
+dlls/__install-lib__ dlls/__install-dev__: libs tools include/__install__
+include/__install__: include libs tools
 libs/__install-lib__ libs/__install-dev__: libs
 fonts/__install__ loader/__install__ server/__install__: libs tools
-programs/__install__: libs tools dlls/__install-lib__
+programs/__install__: libs tools include/__install__ dlls/__install-lib__
 tools/__install__: tools
 
 # Test rules

dlls/itss/Makefile.in

@@ -19,11 +19,4 @@ IDL_SRCS = \
 
 @MAKE_DLL_RULES@
 
-.SUFFIXES: .idl .h
-
-.idl.h:
-	$(WIDL) $(IDLFLAGS) -b -h -H $@ $<
-
-idl: $(IDL_SRCS:.idl=.h)
-
 ### Dependencies:

dlls/ole32/Makefile.in

@@ -68,11 +68,4 @@ SUBDIRS = tests
 
 @MAKE_DLL_RULES@
 
-.SUFFIXES: .idl .h
-
-.idl.h:
-	$(WIDL) $(IDLFLAGS) -b -h -H $@ $<
-
-idl: $(IDL_SRCS:.idl=.h)
-
 ### Dependencies:

include/Makefile.in

@@ -295,14 +295,9 @@ EXTRASUBDIRS = msvcrt msvcrt/sys wine
 
 @MAKE_RULES@
 
-.SUFFIXES: .idl .h
+all: $(IDL_SRCS:.idl=.h)
 
-.idl.h:
-	$(WIDL) $(IDLFLAGS) -b -h -H $@ $<
-
-idl: $(IDL_SRCS:.idl=.h)
-
-install::
+install:: $(IDL_SRCS:.idl=.h)
 	$(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys
 	for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done
 	for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done