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

makefiles: Support non-standard import lib names in the global dll rules.

Browse Source
This commit is contained in:
Alexandre Julliard 2008-03-06 11:54:03 +01:00
parent 51d3d620cf
commit 41f36c49e0
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/Makedll.rules.in
View File

@ -15,7 +15,7 @@ MINGWAR = @MINGWAR@
DEFS = -D__WINESRC__ $(EXTRADEFS) DEFS = -D__WINESRC__ $(EXTRADEFS)
BASEMODULE = $(MODULE:%.dll=%) BASEMODULE = $(MODULE:%.dll=%)
MAINSPEC = $(BASEMODULE).spec MAINSPEC = $(BASEMODULE).spec
SPEC_DEF = lib$(BASEMODULE).def SPEC_DEF = $(BASEMODULE).def
WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16) WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res) ALL_OBJS = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res)
ALL_LIBS = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS) ALL_LIBS = $(EXTRALIBS) $(LIBPORT) $(LDFLAGS) $(LIBS)
@ -47,15 +47,15 @@ all implib: $(IMPORTLIBFILE) $(IMPLIB_SRCS:%=__static_implib__%)
$(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB) $(IMPLIB_SRCS:%=__static_implib__%): $(STATICIMPLIB)
lib$(BASEMODULE).def: $(MAINSPEC) $(SPEC_DEF) $(IMPORTLIB:%=lib%.def): $(MAINSPEC)
$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
lib$(BASEMODULE).def.a: $(IMPLIB_OBJS) $(IMPORTLIB:%=lib%.def.a): $(IMPLIB_OBJS)
$(RM) $@ $(RM) $@
$(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS) $(AR) $(ARFLAGS) $@ $(IMPLIB_OBJS)
$(RANLIB) $@ $(RANLIB) $@
lib$(BASEMODULE).a: $(SPEC_DEF) $(IMPLIB_OBJS) $(IMPORTLIB:%=lib%.a): $(SPEC_DEF) $(IMPLIB_OBJS)
$(DLLTOOL) -k -l $@ -d $(SPEC_DEF) $(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
$(MINGWAR) rs $@ $(IMPLIB_OBJS) $(MINGWAR) rs $@ $(IMPLIB_OBJS)
@ -106,7 +106,7 @@ uninstall::
# Misc. rules # Misc. rules
clean:: clean::
$(RM) $(SPEC_DEF) $(RM) $(SPEC_DEF) $(IMPORTLIBFILE)
$(SPEC_DEF) $(SPEC_SRCS16:.spec=.spec.o): $(WINEBUILD) $(SPEC_DEF) $(SPEC_SRCS16:.spec=.spec.o): $(WINEBUILD)

9
dlls/d3dx9_36/Makefile.in
View File

@ -11,13 +11,4 @@ C_SRCS = \
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
libd3dx9.def: $(MAINSPEC)
$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
libd3dx9.a: $(SPEC_DEF)
$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
clean::
$(RM) $(IMPORTLIBFILE)
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend

9
dlls/winspool.drv/Makefile.in
View File

@ -15,13 +15,4 @@ RC_SRCS = winspool.rc
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@
libwinspool.def: $(MAINSPEC)
$(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC)
libwinspool.a: $(SPEC_DEF)
$(DLLTOOL) -k -l $@ -d $(SPEC_DEF)
clean::
$(RM) $(IMPORTLIBFILE)
@DEPENDENCIES@ # everything below this line is overwritten by make depend @DEPENDENCIES@ # everything below this line is overwritten by make depend