ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed installation rules for Wine-specific IDL files.

This commit is contained in:
Alexandre Julliard 2005-08-25 10:40:53 +00:00
parent 5a07e6eda1
commit aa981732dc
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/Makefile.in
View File

@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = none MODULE = none
IDL_SRCS = \ WINDOWS_IDL_SRCS = \
activscp.idl \ activscp.idl \
amstream.idl \ amstream.idl \
amvideo.idl \ amvideo.idl \
@ -42,18 +42,17 @@ IDL_SRCS = \
urlmon.idl \ urlmon.idl \
wtypes.idl \ wtypes.idl \
xmldom.idl \ xmldom.idl \
xmldso.idl \ xmldso.idl
wine/itss.idl
IDL_INCLUDES = \ WINDOWS_IDL_INCLUDES = \
$(IDL_SRCS) \ $(WINDOWS_IDL_SRCS) \
axcore.idl \ axcore.idl \
axextend.idl \ axextend.idl \
devenum.idl \ devenum.idl \
dyngraph.idl dyngraph.idl
WINDOWS_INCLUDES = \ WINDOWS_INCLUDES = \
$(IDL_INCLUDES) \ $(WINDOWS_IDL_INCLUDES) \
accctrl.h \ accctrl.h \
aclapi.h \ aclapi.h \
advpub.h \ advpub.h \
@ -326,16 +325,24 @@ MSVCRT_INCLUDES = \
msvcrt/wchar.h \ msvcrt/wchar.h \
msvcrt/wctype.h msvcrt/wctype.h
WINE_IDL_SRCS = \
itss.idl
WINE_INCLUDES = \ WINE_INCLUDES = \
$(WINE_IDL_SRCS) \
debug.h \ debug.h \
exception.h \ exception.h \
library.h \ library.h \
unicode.h unicode.h
IDL_SRCS = $(WINDOWS_IDL_SRCS) $(WINE_IDL_SRCS:%=wine/%)
EXTRASUBDIRS = msvcrt msvcrt/sys wine EXTRASUBDIRS = msvcrt msvcrt/sys wine
@MAKE_RULES@ @MAKE_RULES@
WINDOWS_IDL_HEADERS = $(WINDOWS_IDL_SRCS:.idl=.h)
WINE_IDL_HEADERS = $(WINE_IDL_SRCS:.idl=.h)
IDL_HEADERS = $(IDL_SRCS:.idl=.h) IDL_HEADERS = $(IDL_SRCS:.idl=.h)
all: $(IDL_HEADERS) all: $(IDL_HEADERS)
@ -343,15 +350,16 @@ all: $(IDL_HEADERS)
install:: $(IDL_HEADERS) install:: $(IDL_HEADERS)
$(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys $(MKINSTALLDIRS) $(includedir) $(includedir)/windows $(includedir)/msvcrt $(includedir)/msvcrt/sys
for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done for f in $(WINDOWS_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/windows/$$f; done
for f in $(IDL_HEADERS); do $(INSTALL_DATA) $$f $(includedir)/windows/$$f; done for f in $(WINDOWS_IDL_HEADERS); do $(INSTALL_DATA) $$f $(includedir)/windows/$$f; done
for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done for f in $(MSVCRT_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/$$f $(includedir)/$$f; done
for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/$$f; done for f in $(WINE_INCLUDES); do $(INSTALL_DATA) $(SRCDIR)/wine/$$f $(includedir)/$$f; done
for f in $(WINE_IDL_HEADERS); do $(INSTALL_DATA) wine/$$f $(includedir)/$$f; done
# 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::
[ -d $(includedir)/windows ] && cd $(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(IDL_HEADERS) || true [ -d $(includedir)/windows ] && cd $(includedir)/windows && $(RM) $(WINDOWS_INCLUDES) $(WINDOWS_IDL_HEADERS) || true
[ -d $(includedir) ] && cd $(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) || true [ -d $(includedir) ] && cd $(includedir) && $(RM) $(MSVCRT_INCLUDES) $(WINE_INCLUDES) $(WINE_IDL_HEADERS) || true
-rmdir $(includedir)/msvcrt/sys $(includedir)/msvcrt $(includedir)/windows $(includedir) -rmdir $(includedir)/msvcrt/sys $(includedir)/msvcrt $(includedir)/windows $(includedir)
### Dependencies: ### Dependencies: