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

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

This commit is contained in:
Alexandre Julliard 2008-03-03 15:18:57 +01:00
parent df294844a4
commit c72b9b2820
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/Makedll.rules.in
View File

@ -81,19 +81,8 @@ doc-sgml: $(C_SRCS) dummy
# Rules for installation # 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: install_static_implib_def install_static_implib_a
.PHONY: $(SPEC_SRCS16:%=_install_/%) $(ALL_SPECS16:%=_install_/%) $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) .PHONY: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
$(SPEC_SRCS16:%=_install_/%): $(ALL_SPECS16:%=_install_/%)
$(ALL_SPECS16:%=_install_/%): $(DESTDIR)$(dlldir) dummy
echo "$(MODULE)" > $(DESTDIR)$(dlldir)/`basename $@`
$(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy $(IMPORTLIB:%=_install_/%): $(IMPORTLIB) $(DESTDIR)$(dlldir) dummy
$(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB) $(INSTALL_DATA) $(IMPORTLIB) $(DESTDIR)$(dlldir)/$(IMPORTLIB)
@ -105,13 +94,13 @@ install_static_implib_a:
$(IMPLIB_SRCS:%=_install_static_implib_/%): install_static_implib_$(IMPLIBEXT) $(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_PROGRAM) $(MODULE)$(DLLEXT) $(DESTDIR)$(dlldir)/$(MODULE)$(DLLEXT)
install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%) install install-dev:: $(IMPORTLIB:%=_install_/%) $(IMPLIB_SRCS:%=_install_static_implib_/%)
uninstall:: uninstall::
-cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB) $(ALL_SPECS16) -cd $(DESTDIR)$(dlldir) && $(RM) $(MODULE)$(DLLEXT) $(IMPORTLIB) $(STATICIMPLIB)
# Misc. rules # Misc. rules

12
dlls/Makefile.in
View File

@ -5,6 +5,8 @@ TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
INSTALLDIRS = $(DESTDIR)$(dlldir)
# special configure-dependent targets # special configure-dependent targets
GLU32FILES = glu32 GLU32FILES = glu32
@ -1071,11 +1073,21 @@ winecrt0/libwinecrt0.a: winecrt0
# Misc rules # 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-lib:: $(INSTALLSUBDIRS:%=%/__install-lib__)
install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__) install-dev:: $(INSTALLSUBDIRS:%=%/__install-dev__)
uninstall:: uninstall::
-cd $(DESTDIR)$(dlldir) && $(RM) $(WIN16_FILES)
-rmdir $(DESTDIR)$(dlldir) -rmdir $(DESTDIR)$(dlldir)
clean:: clean::