From 1df72cc7949d85c90dc45989fa65806f36be96ad Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Fri, 9 Feb 2007 14:32:36 +0100 Subject: [PATCH] Make.rules: Automatically generate the header for all types of idl sources. --- Make.rules.in | 10 ++++++---- configure | 2 +- configure.ac | 4 ++-- dlls/oleaut32/tests/Makefile.in | 1 - tools/make_makefiles | 4 ++++ 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Make.rules.in b/Make.rules.in index b254cdf2914..1b051ea3433 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -110,10 +110,12 @@ api_manext = 3w conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej *.flc core -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) +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) +IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \ + $(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h) -CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_H_SRCS:.idl=.h) $(IDL_TLB_SRCS:.idl=.tlb) \ +CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) @@ -309,7 +311,7 @@ doc-sgml: $(DOCSUBDIRS:%=%/__doc_sgml__) $(MC_SRCS:.mc=.mc.rc): $(WMC) -$(IDL_H_SRCS:.idl=.h) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) +$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb): $(WIDL) $(SUBDIRS): dummy @cd $@ && $(MAKE) diff --git a/configure b/configure index 0125b9e40ea..0075ceac6f0 100755 --- a/configure +++ b/configure @@ -20387,7 +20387,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_GEN_HEADERS) \$(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 1f98f160794..4edaa206b01 100644 --- a/configure.ac +++ b/configure.ac @@ -1476,7 +1476,7 @@ AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2 Makefile: dummy\\ -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ \\ -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h)\\ +\$(ALL_OBJS): \$(IDL_GEN_HEADERS)\\ \$(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)"], @@ -1487,7 +1487,7 @@ Makefile: dummy\\ Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_H_SRCS:.idl=.h) +\$(ALL_OBJS): \$(IDL_GEN_HEADERS) \$(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/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 31926100198..7e0b307234e 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -20,7 +20,6 @@ CTESTS = \ RC_SRCS = tmarshal.rc IDL_I_SRCS = tmarshal.idl -IDL_H_SRCS = tmarshal.idl IDL_TLB_SRCS = tmarshal.idl @MAKE_TEST_RULES@ diff --git a/tools/make_makefiles b/tools/make_makefiles index ede3d9d6e49..b21d4ef3e9e 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -92,6 +92,10 @@ my @ignore_srcs = ( [ 'RC_SRCS16', '\.rc', '.res' ], [ 'IDL_TLB_SRCS', '\.idl', '.tlb' ], [ 'IDL_H_SRCS', '\.idl', '.h' ], + [ 'IDL_C_SRCS', '\.idl', '.h' ], + [ 'IDL_I_SRCS', '\.idl', '.h' ], + [ 'IDL_P_SRCS', '\.idl', '.h' ], + [ 'IDL_S_SRCS', '\.idl', '.h' ], [ 'IDL_C_SRCS', '\.idl', '_c.c' ], [ 'IDL_I_SRCS', '\.idl', '_i.c' ], [ 'IDL_P_SRCS', '\.idl', '_p.c' ],