Alexandre Julliard : dlls: Move installation rules for 16-bit placeholders to the top-level makefile.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c72b9b2820885e8d768cfb1c4bd06a12dd838a8e
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c72b9b2820885e8d768cfb1c4b...

Author: Alexandre Julliard 
Date:   Mon Mar  3 15:18:57 2008 +0100

dlls: Move installation rules for 16-bit placeholders to the top-level makefile.

---

dlls/Makedll.rules.in |   17 +++--------------
 dlls/Makefile.in      |   12 ++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 45a8836..5d897bb 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -81,19 +81,8 @@ doc-sgml: $(C_SRCS) dummy

# Rules for installation

-EXE_SPECS16 = $(SPEC_SRCS16:.exe.spec=.exe16)
-DRV_SPECS16 = $(EXE_SPECS16:.drv.spec=.drv16)
-ALL_SPECS16 = $(DRV_SPECS16:.spec=.dll16)
-
-WIN16_INSTALL = $(SPEC_SRCS16:%=_install_/%)
-
 .PHONY: install_static_implib_def install_static_implib_a
-.PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
-
-$(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%)
-
-$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) dummy
-	echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@`
+.PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)

$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy
    $(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
@@ -105,13 +94,13 @@ install_static_implib_a:

$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT)

-install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) @WIN16_INSTALL@ dummy
+install install-lib:: $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir) dummy
    $(INSTALL_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)

install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)

uninstall::
-	-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16)
+	-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB)

# Misc. rules

diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index e2680c9..5b4145d 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -5,6 +5,8 @@ TOPOBJDIR = ..
 SRCDIR    = @srcdir@
 VPATH     = @srcdir@

+INSTALLDIRS = $(DESTDIR)$(dlldir)
+
 # special configure-dependent targets

GLU32FILES = glu32
@@ -1071,11 +1073,21 @@ winecrt0/libwinecrt0.a: winecrt0

# Misc rules

+.PHONY: $(WIN16_FILES:%=__install__/%)
+
+WIN16_INSTALL = $(WIN16_FILES:%=__install__/%)
+
+$(WIN16_FILES:%=__install__/%): $(WIN16_FILES) $(DESTDIR)$(dlldir) dummy
+	$(INSTALL_DATA) `basename $@` $(DESTDIR)$(dlldir)/`basename $@`
+
+install install-lib:: @WIN16_INSTALL@
+
 install-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)

install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)

uninstall::
+	-cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES)
    -rmdir $(DESTDIR)$(dlldir)

clean::