Commit 385247b3 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

stdole2.tlb: Move stdole2.tlb generation to include to allow importlib from other IDLs.

parent 853d1937
...@@ -51,7 +51,11 @@ WINDOWS_IDL_SRCS = \ ...@@ -51,7 +51,11 @@ WINDOWS_IDL_SRCS = \
xmldom.idl \ xmldom.idl \
xmldso.idl xmldso.idl
IDL_TLB_SRCS = \
stdole2.idl
WINDOWS_IDL_INCLUDES = \ WINDOWS_IDL_INCLUDES = \
$(IDL_TLB_SRCS) \
$(WINDOWS_IDL_SRCS) \ $(WINDOWS_IDL_SRCS) \
axcore.idl \ axcore.idl \
axextend.idl \ axextend.idl \
...@@ -379,13 +383,14 @@ EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine ...@@ -379,13 +383,14 @@ EXTRASUBDIRS = ddk msvcrt msvcrt/sys wine
WINDOWS_IDL_HEADERS = $(WINDOWS_IDL_SRCS:.idl=.h) WINDOWS_IDL_HEADERS = $(WINDOWS_IDL_SRCS:.idl=.h)
WINE_IDL_HEADERS = $(WINE_IDL_SRCS:.idl=.h) WINE_IDL_HEADERS = $(WINE_IDL_SRCS:.idl=.h)
IDL_HEADERS = $(IDL_SRCS:.idl=.h) IDL_HEADERS = $(IDL_SRCS:.idl=.h)
IDL_TLBS = $(IDL_TLB_SRCS:.idl=.tlb)
all: $(IDL_HEADERS) all: $(IDL_HEADERS) $(IDL_TLBS)
install:: $(IDL_HEADERS) install:: $(IDL_HEADERS) $(IDL_TLBS)
$(MKINSTALLDIRS) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/msvcrt/sys $(MKINSTALLDIRS) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/msvcrt/sys
for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/windows/$$f; done for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/windows/$$f; done
for f in $(WINDOWS_IDL_HEADERS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f; done for f in $(WINDOWS_IDL_HEADERS) $(IDL_TLBS); do $(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/windows/$$f; done
for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f; done for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(DESTDIR)$(includedir)/$$f; done
for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(DESTDIR)$(includedir)/$$f; done for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(DESTDIR)$(includedir)/$$f; done
for f in $(WINE_IDL_HEADERS); do $(INSTALL_DATA) wine/$$f $(DESTDIR)$(includedir)/$$f; done for f in $(WINE_IDL_HEADERS); do $(INSTALL_DATA) wine/$$f $(DESTDIR)$(includedir)/$$f; done
...@@ -393,7 +398,7 @@ install:: $(IDL_HEADERS) ...@@ -393,7 +398,7 @@ install:: $(IDL_HEADERS)
# Don't just do a rm -rf on $(includedir) -- don't want to wipe out # Don't just do a rm -rf on $(includedir) -- don't want to wipe out
# anything extra the user may have put there. # anything extra the user may have put there.
uninstall:: uninstall::
-cd $(DESTDIR)$(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS) -cd $(DESTDIR)$(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS) $(IDL_TLBS)
-cd $(DESTDIR)$(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) $(WINE_IDL_HEADERS) -cd $(DESTDIR)$(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) $(WINE_IDL_HEADERS)
-rmdir $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir) -rmdir $(DESTDIR)$(includedir)/msvcrt/sys $(DESTDIR)$(includedir)/msvcrt $(DESTDIR)$(includedir)/windows/ddk $(DESTDIR)$(includedir)/windows $(DESTDIR)$(includedir)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment