From 2a77543c5372de75bf09e96d39808409bd8d837a Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 12 Nov 2021 15:17:52 +0100
Subject: [PATCH] include: Stop building tlb files in the include directory.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/stdole2.tlb/Makefile.in              |  2 +-
 dlls/stdole2.tlb/std_ole_v2.idl           | 23 -----------------------
 {include => dlls/stdole2.tlb}/stdole2.idl |  3 +--
 include/Makefile.in                       |  1 -
 include/oleacc.idl                        |  6 ------
 5 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 dlls/stdole2.tlb/std_ole_v2.idl
 rename {include => dlls/stdole2.tlb}/stdole2.idl (99%)

diff --git a/dlls/stdole2.tlb/Makefile.in b/dlls/stdole2.tlb/Makefile.in
index 60163996d4c..1a254979a54 100644
--- a/dlls/stdole2.tlb/Makefile.in
+++ b/dlls/stdole2.tlb/Makefile.in
@@ -1,4 +1,4 @@
 MODULE    = stdole2.tlb
 
 RC_SRCS = rsrc.rc
-IDL_SRCS = std_ole_v2.idl
+IDL_SRCS = stdole2.idl
diff --git a/dlls/stdole2.tlb/std_ole_v2.idl b/dlls/stdole2.tlb/std_ole_v2.idl
deleted file mode 100644
index 649d1822889..00000000000
--- a/dlls/stdole2.tlb/std_ole_v2.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2003 Robert Shearman
- *               2005 Huw Davies
- *
- * 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
- *
- */
-
-#pragma makedep regtypelib
-
-#include "stdole2.idl"
diff --git a/include/stdole2.idl b/dlls/stdole2.tlb/stdole2.idl
similarity index 99%
rename from include/stdole2.idl
rename to dlls/stdole2.tlb/stdole2.idl
index b65907072db..178d9b71690 100644
--- a/include/stdole2.idl
+++ b/dlls/stdole2.tlb/stdole2.idl
@@ -19,8 +19,7 @@
  */
 
 #if 0
-#pragma makedep install
-#pragma makedep typelib
+#pragma makedep regtypelib
 #endif
 
 #include <olectl.h>
diff --git a/include/Makefile.in b/include/Makefile.in
index 114440f8b39..df049fd284f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -683,7 +683,6 @@ SOURCES = \
 	srcrst.idl \
 	srrestoreptapi.h \
 	sspi.h \
-	stdole2.idl \
 	stgprop.h \
 	sti.h \
 	storage.h \
diff --git a/include/oleacc.idl b/include/oleacc.idl
index 7cf0fa82db4..fd9c0786d1b 100644
--- a/include/oleacc.idl
+++ b/include/oleacc.idl
@@ -16,12 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#if 0
-#pragma makedep install
-#pragma makedep typelib
-#pragma makedep header
-#endif
-
 import "oaidl.idl";
 
 #ifndef __WIDL__