Alexandre Julliard : make_makefiles: Explicitly list the Wine headers that should be exported.
Alexandre Julliard
julliard at winehq.org
Wed Jul 23 07:09:50 CDT 2008
Module: wine
Branch: master
Commit: d96e3964b701bec327d0f1cc67a38596493814cd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d96e3964b701bec327d0f1cc67a38596493814cd
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jul 23 11:40:43 2008 +0200
make_makefiles: Explicitly list the Wine headers that should be exported.
---
.gitignore | 2 --
dlls/rpcrt4/epm_towers.h | 2 +-
include/Makefile.in | 2 --
tools/make_makefiles | 33 ++++++++-------------------------
4 files changed, 9 insertions(+), 30 deletions(-)
diff --git a/.gitignore b/.gitignore
index a60cefd..72a2fdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -183,8 +183,6 @@ include/unknwn.h
include/urlhist.h
include/urlmon.h
include/vmr9.h
-include/wine/dcetypes.h
-include/wine/epm.h
include/wine/itss.h
include/wine/svcctl.h
include/wtypes.h
diff --git a/dlls/rpcrt4/epm_towers.h b/dlls/rpcrt4/epm_towers.h
index f38d487..3eec37a 100644
--- a/dlls/rpcrt4/epm_towers.h
+++ b/dlls/rpcrt4/epm_towers.h
@@ -19,7 +19,7 @@
*
*/
-#include "wine/epm.h"
+#include "epm.h"
#define EPM_PROTOCOL_DNET_NSP 0x04
#define EPM_PROTOCOL_OSI_TP4 0x05
diff --git a/include/Makefile.in b/include/Makefile.in
index 0adef3c..99b06d9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -69,8 +69,6 @@ IDL_H_SRCS = \
urlhist.idl \
urlmon.idl \
vmr9.idl \
- wine/dcetypes.idl \
- wine/epm.idl \
wine/itss.idl \
wine/svcctl.idl \
wtypes.idl \
diff --git a/tools/make_makefiles b/tools/make_makefiles
index d87b3ce..8f15011 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -104,30 +104,13 @@ my @ignore_srcs = (
[ 'IDL_S_SRCS', '\.idl', '_s.c' ],
);
-my %private_headers = (
- "wine/irot.idl" => 1,
- "wine/list.h" => 1,
- "wine/mmsystem16.h" => 1,
- "wine/mscvpdb.h" => 1,
- "wine/port.h" => 1,
- "wine/pthread.h" => 1,
- "wine/rpcfc.h" => 1,
- "wine/server.h" => 1,
- "wine/server_protocol.h" => 1,
- "wine/test.h" => 1,
- "wine/wgl.h" => 1,
- "wine/winaspi.h" => 1,
- "wine/winbase16.h" => 1,
- "wine/windef16.h" => 1,
- "wine/wined3d_caps.h" => 1,
- "wine/wined3d_gl.h" => 1,
- "wine/wined3d_interface.h" => 1,
- "wine/wined3d_types.h" => 1,
- "wine/wingdi16.h" => 1,
- "wine/winnet16.h" => 1,
- "wine/winsock16.h" => 1,
- "wine/winuser16.h" => 1,
- "wine/wpp.h" => 1
+my %exported_wine_headers = (
+ "wine/debug.h" => 1,
+ "wine/exception.h" => 1,
+ "wine/library.h" => 1,
+ "wine/unicode.h" => 1,
+ "wine/itss.idl" => 1,
+ "wine/svcctl.idl" => 1,
);
my %private_idl_headers = (
@@ -654,7 +637,7 @@ sub update_includes()
foreach my $incl (@includes)
{
if ($incl =~ /(.*)\//) { $subdirs{$1} = 1; }
- next if ($private_headers{$incl});
+ next if ($incl =~ /^wine\// && !$exported_wine_headers{$incl});
if ($incl =~ /stdole2\.idl$/) { push @tlb_srcs, $incl; }
elsif ($private_idl_headers{$incl}) { push @h_srcs, $incl; }
elsif ($incl =~ /\.h$/) { push @h_srcs, $incl; }
More information about the wine-cvs
mailing list