diff --git a/include/Makefile.in b/include/Makefile.in index e3c0acc210..299a095119 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,25 +1,35 @@ IDL_SRCS = \ + access.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ amstream.idl \ amvideo.idl \ asptlb.idl \ + asynot.idl \ + asysta.idl \ atliface.idl \ audioclient.idl \ audiopolicy.idl \ austream.idl \ + axcore.idl \ + axextend.idl \ bdaiface.idl \ + binres.idl \ bits.idl \ bits1_5.idl \ bits2_0.idl \ bits2_5.idl \ bits3_0.idl \ + chprst.idl \ + cmdbas.idl \ + cmdtxt.idl \ comcat.idl \ commoncontrols.idl \ control.idl \ cor.idl \ cordebug.idl \ + crtrow.idl \ ctfutb.idl \ ctxtcall.idl \ d2d1.idl \ @@ -30,7 +40,14 @@ IDL_SRCS = \ d3d11sdklayers.idl \ d3dcommon.idl \ d3dx10core.idl \ + dbccmd.idl \ + dbcses.idl \ + dbdsad.idl \ + dbinit.idl \ + dbprop.idl \ + dbs.idl \ ddstream.idl \ + devenum.idl \ devicetopology.idl \ dimm.idl \ dispex.idl \ @@ -43,7 +60,9 @@ IDL_SRCS = \ dxgi.idl \ dxgi1_2.idl \ dxva2api.idl \ + dyngraph.idl \ endpointvolume.idl \ + errrec.idl \ exdisp.idl \ fusion.idl \ gameux.idl \ @@ -96,6 +115,7 @@ IDL_SRCS = \ oleacc.idl \ oledb.idl \ oleidl.idl \ + opnrst.idl \ optary.idl \ perhist.idl \ propidl.idl \ @@ -103,12 +123,22 @@ IDL_SRCS = \ pstore.idl \ qedit.idl \ richole.idl \ + row.idl \ + rowchg.idl \ + rowpos.idl \ + rowpsc.idl \ + rstbas.idl \ + rstinf.idl \ + rstloc.idl \ + rstnot.idl \ sensevts.idl \ servprov.idl \ + sesprp.idl \ shdeprecated.idl \ shldisp.idl \ shobjidl.idl \ shtypes.idl \ + srcrst.idl \ stdole2.idl \ strmif.idl \ structuredquerycondition.idl \ @@ -125,6 +155,7 @@ IDL_SRCS = \ urlhist.idl \ urlmon.idl \ vmr9.idl \ + vmrender.idl \ vss.idl \ wbemcli.idl \ wbemdisp.idl \ @@ -148,6 +179,8 @@ IDL_SRCS = \ xapo.idl \ xaudio2.idl \ xaudio2fx.idl \ + xmldom.idl \ + xmldso.idl \ xmllite.idl HEADER_SRCS = \ @@ -639,55 +672,3 @@ HEADER_SRCS = \ XTEMPLATE_SRCS = \ rmxftmpl.x - -SRCDIR_INCLUDES = \ - access.idl \ - asynot.idl \ - asysta.idl \ - axcore.idl \ - axextend.idl \ - binres.idl \ - chprst.idl \ - cmdbas.idl \ - cmdtxt.idl \ - crtrow.idl \ - dbccmd.idl \ - dbcses.idl \ - dbdsad.idl \ - dbinit.idl \ - dbprop.idl \ - dbs.idl \ - devenum.idl \ - dyngraph.idl \ - errrec.idl \ - opnrst.idl \ - row.idl \ - rowchg.idl \ - rowpos.idl \ - rowpsc.idl \ - rstbas.idl \ - rstinf.idl \ - rstloc.idl \ - rstnot.idl \ - sesprp.idl \ - srcrst.idl \ - vmrender.idl \ - xmldom.idl \ - xmldso.idl - -install install-dev:: - for f in $(SRCDIR_INCLUDES); do case $$f in \ - wine/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \ - msvcrt/*) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/$$f ;; \ - *) $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(includedir)/windows/$$f ;; \ - esac; done - -# Don't just do a rm -rf on $(includedir) -- don't want to wipe out -# anything extra the user may have put there. -uninstall:: - for f in $(SRCDIR_INCLUDES); do case $$f in \ - wine/*) $(RM) $(DESTDIR)$(includedir)/`expr $$f : 'wine/\(.*\)'` ;; \ - msvcrt/*) $(RM) $(DESTDIR)$(includedir)/$$f ;; \ - *) $(RM) $(DESTDIR)$(includedir)/windows/$$f ;; \ - esac; done - -rmdir $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt diff --git a/include/access.idl b/include/access.idl index e7beb99a2c..a1585f23b2 100644 --- a/include/access.idl +++ b/include/access.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a8c-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/asynot.idl b/include/asynot.idl index 2f52713a49..83a45aa17f 100644 --- a/include/asynot.idl +++ b/include/asynot.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a96-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/asysta.idl b/include/asysta.idl index e3e009e3b8..503ae469bb 100644 --- a/include/asysta.idl +++ b/include/asysta.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a95-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/axcore.idl b/include/axcore.idl index 54523d5215..9bd76044d9 100644 --- a/include/axcore.idl +++ b/include/axcore.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + #define CHARS_IN_GUID 39 cpp_quote("#define CHARS_IN_GUID 39") diff --git a/include/axextend.idl b/include/axextend.idl index 716740c81c..bde222918a 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + interface IAMAnalogVideoDecoder; interface IAMAnalogVideoEncoder; interface IAMAudioInputMixer; diff --git a/include/binres.idl b/include/binres.idl index 3797c02882..4923f311f5 100644 --- a/include/binres.idl +++ b/include/binres.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733ab1-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/chprst.idl b/include/chprst.idl index 90aed713b4..37ec957bba 100644 --- a/include/chprst.idl +++ b/include/chprst.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a93-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/cmdbas.idl b/include/cmdbas.idl index 21a3397198..5ac9bb47d1 100644 --- a/include/cmdbas.idl +++ b/include/cmdbas.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a63-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/cmdtxt.idl b/include/cmdtxt.idl index 467a67c2c7..1d68d7a424 100644 --- a/include/cmdtxt.idl +++ b/include/cmdtxt.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a27-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/crtrow.idl b/include/crtrow.idl index 98c0bce8cb..8c602f65fc 100644 --- a/include/crtrow.idl +++ b/include/crtrow.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733ab2-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbccmd.idl b/include/dbccmd.idl index 28763d202f..28c1c64dc5 100644 --- a/include/dbccmd.idl +++ b/include/dbccmd.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a1d-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbcses.idl b/include/dbcses.idl index 5441815947..4df17e3e51 100644 --- a/include/dbcses.idl +++ b/include/dbcses.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a5d-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbdsad.idl b/include/dbdsad.idl index ad2695efb8..5a729cdeaf 100644 --- a/include/dbdsad.idl +++ b/include/dbdsad.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a7a-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbinit.idl b/include/dbinit.idl index e2edd17eac..f272018e6a 100644 --- a/include/dbinit.idl +++ b/include/dbinit.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a8b-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbprop.idl b/include/dbprop.idl index 782191a455..4a911c03d9 100644 --- a/include/dbprop.idl +++ b/include/dbprop.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a8a-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/dbs.idl b/include/dbs.idl index 1e0ac6ca57..2c46c2bb16 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + typedef DWORD DBKIND; enum DBKINDENUM { diff --git a/include/devenum.idl b/include/devenum.idl index 046d2b50f1..f7eaf9a4a5 100644 --- a/include/devenum.idl +++ b/include/devenum.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + import "oaidl.idl"; cpp_quote("#define CDEF_CLASS_DEFAULT 0x0001") diff --git a/include/dyngraph.idl b/include/dyngraph.idl index 7330cb914b..92f91e8415 100644 --- a/include/dyngraph.idl +++ b/include/dyngraph.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + interface IPinConnection; interface IPinFlowControl; interface IGraphConfig; diff --git a/include/errrec.idl b/include/errrec.idl index 865b3f2b46..b7c7cbfb5f 100644 --- a/include/errrec.idl +++ b/include/errrec.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a67-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/opnrst.idl b/include/opnrst.idl index 07c23805fc..f5518fd6a8 100644 --- a/include/opnrst.idl +++ b/include/opnrst.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a69-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/row.idl b/include/row.idl index f56eade5de..554bc4b34d 100644 --- a/include/row.idl +++ b/include/row.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ local, object, diff --git a/include/rowchg.idl b/include/rowchg.idl index 7bfa50673e..4c2000a681 100644 --- a/include/rowchg.idl +++ b/include/rowchg.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ local, object, diff --git a/include/rowpos.idl b/include/rowpos.idl index 1ef6807726..7658d195e9 100644 --- a/include/rowpos.idl +++ b/include/rowpos.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a94-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/rowpsc.idl b/include/rowpsc.idl index 2cbe8ac8e2..04fabd49db 100644 --- a/include/rowpsc.idl +++ b/include/rowpsc.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0997a571-126e-11d0-9f8a-00a0c9a0631e), diff --git a/include/rstbas.idl b/include/rstbas.idl index 94d23f1ee3..abf1359d65 100644 --- a/include/rstbas.idl +++ b/include/rstbas.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ local, object, diff --git a/include/rstinf.idl b/include/rstinf.idl index 7c9779bab6..f26c55ca4f 100644 --- a/include/rstinf.idl +++ b/include/rstinf.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a55-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/rstloc.idl b/include/rstloc.idl index 266aabf65a..e02583a9ba 100644 --- a/include/rstloc.idl +++ b/include/rstloc.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ local, object, diff --git a/include/rstnot.idl b/include/rstnot.idl index c76691e3f2..9e6975f9c7 100644 --- a/include/rstnot.idl +++ b/include/rstnot.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a83-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/sesprp.idl b/include/sesprp.idl index b4aa727bad..fce5bbc4f8 100644 --- a/include/sesprp.idl +++ b/include/sesprp.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a85-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/srcrst.idl b/include/srcrst.idl index 83aae52e31..57fd3513fe 100644 --- a/include/srcrst.idl +++ b/include/srcrst.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + [ object, uuid(0c733a1e-2a1c-11ce-ade5-00aa0044773d), diff --git a/include/vmrender.idl b/include/vmrender.idl index 3c3fd7bd30..c3d053dbb0 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + cpp_quote("#if 0") typedef DWORD IDirectDrawSurface7; typedef DWORD IDirectDraw7; diff --git a/include/xmldom.idl b/include/xmldom.idl index a38859252a..8bca78ab7f 100644 --- a/include/xmldom.idl +++ b/include/xmldom.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + #include #include diff --git a/include/xmldso.idl b/include/xmldso.idl index 86f2a3a86b..95c6510e05 100644 --- a/include/xmldso.idl +++ b/include/xmldso.idl @@ -16,6 +16,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#if 0 +#pragma makedep install +#endif + #include #include diff --git a/tools/make_makefiles b/tools/make_makefiles index b97f04ec29..15257692d0 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -47,46 +47,10 @@ my %exported_wine_headers = ( "wine/svcctl.idl" => 1, ); -my %private_idl_headers = ( - "access.idl" => 1, - "asynot.idl" => 1, - "asysta.idl" => 1, - "axcore.idl" => 1, - "axextend.idl" => 1, - "binres.idl" => 1, - "chprst.idl" => 1, - "cmdbas.idl" => 1, - "cmdtxt.idl" => 1, - "crtrow.idl" => 1, - "dbccmd.idl" => 1, - "dbcses.idl" => 1, - "dbdsad.idl" => 1, - "dbinit.idl" => 1, - "dbprop.idl" => 1, - "dbs.idl" => 1, - "devenum.idl" => 1, - "dyngraph.idl" => 1, - "errrec.idl" => 1, - "opnrst.idl" => 1, - "row.idl" => 1, - "rowchg.idl" => 1, - "rowpos.idl" => 1, - "rowpsc.idl" => 1, - "rstbas.idl" => 1, - "rstinf.idl" => 1, - "rstloc.idl" => 1, - "rstnot.idl" => 1, - "srcrst.idl" => 1, - "sesprp.idl" => 1, - "vmrender.idl" => 1, - "xmldom.idl" => 1, - "xmldso.idl" => 1, - "wine/winedxgi.idl" => 1, -); - my %ignored_source_files = ( "dlls/wineps.drv/afm2c.c" => 1, "dlls/wineps.drv/mkagl.c" => 1, + "include/config.h.in" => 1, "programs/winetest/dist.rc" => 1, "tools/makedep.c" => 1, ); @@ -365,69 +329,59 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile"}; my $name = substr( $file, length($dir) + 1 ); + my %flags = get_makedep_flags( $file ); + + next if $file =~ /^include\/wine\// && !%flags && !$exported_wine_headers{$name}; ${$make}{"=flags"}{"clean"} = 1 if $subdir; - if ($dir eq "include") + if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } + elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } + elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } + elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } + elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } + elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } + elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } + elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } + elsif ($name =~ /\.c$/) { - next if ($name =~ /\.in$/); - if ($name =~ /^wine\// && !$exported_wine_headers{$name}) + if (defined $flags{"implib"}) { - if ($private_idl_headers{$name}) { push @{${$make}{"=IDL_SRCS"}}, $name; } - next; + push @{${$make}{"=IMPLIB_SRCS"}}, $name; + ${${$make}{"=flags"}}{"staticimplib"} = 1; } - if ($private_idl_headers{$name}) { push @{${$make}{"=SRCDIR_INCLUDES"}}, $name; } - elsif ($name =~ /\.h$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } - elsif ($name =~ /\.x$/) { push @{${$make}{"=XTEMPLATE_SRCS"}}, $name; } - elsif ($name =~ /\.rh$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } - elsif ($name =~ /\.inl$/) { push @{${$make}{"=HEADER_SRCS"}}, $name; } - elsif ($name =~ /\.idl$/) { push @{${$make}{"=IDL_SRCS"}}, $name; } - else { die "unknown file $name in include dir"; } + push @{${$make}{"=C_SRCS"}}, $name; } - else + elsif ($name =~ /\.h$/) { - if ($name =~ /\.m$/) { push @{${$make}{"=OBJC_SRCS"}}, $name; } - elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } - elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } - elsif ($name =~ /\.svg$/) { push @{${$make}{"=SVG_SRCS"}}, $name; } - elsif ($name =~ /\.sfd$/) { push @{${$make}{"=FONT_SRCS"}}, $name; } - elsif ($name =~ /\.c$/) - { - my %flags = get_makedep_flags( $file ); - if (defined $flags{"implib"}) - { - push @{${$make}{"=IMPLIB_SRCS"}}, $name; - ${${$make}{"=flags"}}{"staticimplib"} = 1; - } - push @{${$make}{"=C_SRCS"}}, $name; - } - elsif ($name =~ /\.rc$/) - { - my %flags = get_makedep_flags( $file ); - ${${$make}{"=flags"}}{"po"} = 1 if defined $flags{"po"}; - push @{${$make}{"=RC_SRCS"}}, $name; - } - elsif ($name =~ /\.mc$/) - { - push @{${$make}{"=MC_SRCS"}}, $name; - ${${$make}{"=flags"}}{"mc"} = 1; - } - elsif ($name =~ /\.idl$/) - { - my %flags = get_makedep_flags( $file ); - die "no makedep flags specified in $file" unless %flags; - push @{${$make}{"=IDL_SRCS"}}, $name; - ${${$make}{"=flags"}}{"clean"} = 1; - } - elsif ($name =~ /\.man\.in$/) - { - push @{${$make}{"=MANPAGES"}}, $name; - ${${$make}{"=flags"}}{"manpage"} = 1; - } - elsif ($name =~ /\.in$/) - { - push @{${$make}{"=IN_SRCS"}}, $name; - } + next if $dir ne "include"; + push @{${$make}{"=HEADER_SRCS"}}, $name; + ${${$make}{"=flags"}}{"install-dev"} = 1; + } + elsif ($name =~ /\.rc$/) + { + ${${$make}{"=flags"}}{"po"} = 1 if defined $flags{"po"}; + push @{${$make}{"=RC_SRCS"}}, $name; + } + elsif ($name =~ /\.mc$/) + { + push @{${$make}{"=MC_SRCS"}}, $name; + ${${$make}{"=flags"}}{"mc"} = 1; + } + elsif ($name =~ /\.idl$/) + { + die "no makedep flags specified in $file" unless %flags || $dir eq "include"; + push @{${$make}{"=IDL_SRCS"}}, $name; + ${${$make}{"=flags"}}{"clean"} = 1; + } + elsif ($name =~ /\.man\.in$/) + { + push @{${$make}{"=MANPAGES"}}, $name; + ${${$make}{"=flags"}}{"manpage"} = 1; + } + elsif ($name =~ /\.in$/) + { + push @{${$make}{"=IN_SRCS"}}, $name; } } @@ -548,8 +502,6 @@ sub update_makefiles(@) replace_makefile_variable( $file, "IN_SRCS" ); replace_makefile_variable( $file, "IMPLIB_SRCS" ); replace_makefile_variable( $file, "MANPAGES" ); - next unless $file eq "include/Makefile"; - replace_makefile_variable( $file, "SRCDIR_INCLUDES" ); } push @lines, "dnl End of auto-generated output commands\n";