Module: wine Branch: master Commit: 5f10595c5cd940c719cda8dbfbf89a30771c4a37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f10595c5cd940c719cda8dbfb...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Aug 18 11:33:26 2009 +0200
makefiles: Add rules for installing fake modules.
---
Make.rules.in | 1 + dlls/Makedll.rules.in | 17 ++++++++++++++--- dlls/Makefile.in | 2 +- programs/Makefile.in | 2 +- programs/Makeprog.rules.in | 18 ++++++++---------- 5 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in index 9ce72d1..7220245 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -106,6 +106,7 @@ mandir = @mandir@ sysconfdir = @sysconfdir@ includedir = @includedir@/wine dlldir = @libdir@/wine +fakedlldir = $(dlldir)/fakedlls prog_manext = 1 api_manext = 3w conf_manext = 5 diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index a2c981e..ab7e8fd 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -21,7 +21,7 @@ IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o) IMPORTLIBFILE = $(IMPORTLIB:%=lib%.@IMPLIBEXT@) STATICIMPLIB = $(IMPORTLIBFILE:.def=.def.a) DLL_LDPATH = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%) -INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine +INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(datadir)/wine
@MAKE_RULES@
@@ -89,13 +89,24 @@ install_static_implib_a:
$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)
-install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy - $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) +.PHONY: install_dll install_dll.so install_dll.fake + +install_dll: $(MODULE) $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE) + +install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy + $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so + +install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + +install install-lib:: install_dll$(DLLEXT) install_dll$(FAKEEXT)
install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) dummy
uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIBFILE) $(STATICIMPLIB) + $(RM) $(DESTDIR)$(fakedlldir)/$(MODULE)
# Misc. rules
diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 8f2a977..3ff953c 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -849,7 +849,7 @@ install install-lib:: @WIN16_INSTALL@
uninstall:: -cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
clean:: $(RM) $(IMPORT_SYMLINKS) $(WIN16_FILES) diff --git a/programs/Makefile.in b/programs/Makefile.in index fcfeb50..b339aa3 100644 --- a/programs/Makefile.in +++ b/programs/Makefile.in @@ -37,7 +37,7 @@ install-progs: # nothing to do here
uninstall:: -cd $(DESTDIR)$(bindir) && $(RM) wineapploader $(INSTALLPROGS) - -rmdir $(DESTDIR)$(dlldir) + -rmdir $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir)
# Rules for testing
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 4fc2093..6135771 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -13,7 +13,7 @@ DLLFLAGS = @DLLFLAGS@ DEFS = $(EXTRADEFS) ALL_LIBS = $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(EXTRALIBS) -lwine $(LIBPORT) $(LDFLAGS) $(LIBS) RUNTESTFLAGS= -q -P wine -T $(TOPOBJDIR) -INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(mandir)/man$(prog_manext) +INSTALLDIRS = $(DESTDIR)$(bindir) $(DESTDIR)$(dlldir) $(DESTDIR)$(fakedlldir) $(DESTDIR)$(mandir)/man$(prog_manext)
@MAKE_RULES@
@@ -30,23 +30,21 @@ $(TESTRESULTS): $(MODULE)$(DLLEXT)
# Rules for installation
-.PHONY: install_prog install_prog.so uninstall_prog uninstall_prog.so +.PHONY: install_prog install_prog.so install_prog.fake
install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy $(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
+install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy + $(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE) + install_prog: $(MODULE) $(DESTDIR)$(bindir) dummy $(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(bindir)/$(MODULE)
-uninstall_prog.so: dummy - $(RM) $(DESTDIR)$(dlldir)/$(MODULE).so - -uninstall_prog: dummy - $(RM) $(DESTDIR)$(bindir)/$(MODULE) - -install install-lib:: install_prog$(DLLEXT) +install install-lib:: install_prog$(DLLEXT) install_prog$(FAKEEXT)
-uninstall:: uninstall_prog$(DLLEXT) +uninstall:: + $(RM) $(DESTDIR)$(bindir)/$(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT) $(DESTDIR)$(fakedlldir)/$(MODULE)
clean:: $(RM) $(MODULE)
-
Alexandre Julliard