Commit 20b4585e authored by Alexandre Julliard's avatar Alexandre Julliard

Only link against libdxguid where necessary.

parent 6b6ed724
......@@ -78,7 +78,6 @@ DLLDIR = $(TOPOBJDIR)/dlls
LIBDIR = $(TOPOBJDIR)/libs
LIBPORT = -L$(TOPOBJDIR)/libs/port -lwine_port
LIBUNICODE = -L$(TOPOBJDIR)/libs/unicode -lwine_unicode
LIBUUID = -luuid -ldxguid
LIBWINE = -L$(TOPOBJDIR)/libs/wine -lwine
@SET_MAKE@
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = avifil32.dll
IMPORTS = msacm32 msvfw32 shell32 winmm ole32 user32 advapi32 kernel32
ALTNAMES = avifile.dll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = comcat.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUNICODE) $(LIBUUID)
EXTRALIBS = $(LIBUNICODE) -luuid
C_SRCS = \
comcat_main.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = comdlg32.dll
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
ALTNAMES = commdlg.dll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = d3d8.dll
IMPORTS = user32 gdi32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
C_SRCS = \
basetexture.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = d3d9.dll
IMPORTS = user32 gdi32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
C_SRCS = \
basetexture.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = d3dx8.dll
IMPORTS = d3d8 user32 gdi32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
C_SRCS = \
d3dx8_main.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = ddraw.dll
IMPORTS = ole32 user32 gdi32 advapi32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
OPENGLFILES = \
d3dcommon.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = ddraw.dll
IMPORTS = ddraw user32 gdi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
CTESTS = \
ddrawmodes.c
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = devenum.dll
IMPORTS = ole32 oleaut32 winmm user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
createdevenum.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dinput.dll
IMPORTS = user32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
device.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dinput8.dll
IMPORTS = dinput
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
dinput8_main.c
......@@ -12,4 +12,3 @@ C_SRCS = \
@MAKE_DLL_RULES@
### Dependencies:
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmband.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
band.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmcompos.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
chordmap.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmime.dll
IMPORTS = dsound winmm ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
audiopath.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmloader.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
container.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmscript.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
dmscript_main.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmstyle.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
auditiontrack.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmsynth.dll
IMPORTS = winmm ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
dmsynth_main.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmusic.dll
IMPORTS = winmm ole32 msacm32 dsound rpcrt4 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
buffer.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dmusic32.dll
IMPORTS = winmm user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
dmusic32_main.c
......
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dplayx.dll
IMPORTS = winmm ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
dpclassfactory.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dsound.dll
IMPORTS = winmm ole32 user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
buffer.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = dsound.dll
IMPORTS = dsound user32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
CTESTS = \
capture.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = dswave.dll
IMPORTS = msacm32 ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
dswave.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msdmo.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
dmoreg.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = mshtml.dll
IMPORTS = user32 advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUNICODE) $(LIBUUID)
EXTRALIBS = $(LIBUNICODE) -luuid
EXTRADEFS = -DCOM_NO_WINDOWS_H
C_SRCS = \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msi.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
EXTRALIBS = -luuid $(LIBUNICODE)
C_SRCS = \
distinct.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = msisys.ocx
IMPORTS = kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = msisys.c
......
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = ole32.dll
IMPORTS = advapi32 user32 gdi32 rpcrt4 kernel32 ntdll
ALTNAMES = ole2.dll ole2nls.dll ole2conv.dll ole2prox.dll ole2thk.dll storage.dll compobj.dll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
......
......@@ -7,7 +7,7 @@ MODULE = oleaut32.dll
IMPORTS = ole32 rpcrt4 user32 gdi32 advapi32 kernel32 ntdll
DELAYIMPORTS = comctl32
ALTNAMES = ole2disp.dll typelib.dll
EXTRALIBS = $(LIBUNICODE) $(LIBUUID) @GIFLIB@ @JPEGLIB@
EXTRALIBS = $(LIBUNICODE) -luuid @GIFLIB@ @JPEGLIB@
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = oleaut32.dll
IMPORTS = oleaut32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
CTESTS = \
olefont.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = quartz.dll
IMPORTS = ole32 oleaut32 advapi32 kernel32 user32
EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
EXTRALIBS = -luuid $(LIBUNICODE)
C_SRCS = \
avisplit.c \
......
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = rpcrt4.dll
IMPORTS = advapi32 kernel32 ntdll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
cproxy.c \
......
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shdocvw.dll
IMPORTS = ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
classinfo.c \
......
......@@ -7,7 +7,7 @@ MODULE = shell32.dll
# fixme: avoid ole32.dll import
IMPORTS = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32
ALTNAMES = shell.dll
EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
EXTRALIBS = -luuid $(LIBUNICODE)
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
......
......@@ -5,7 +5,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = shlwapi.dll
IMPORTS = ole32 user32 gdi32 advapi32 kernel32
EXTRALIBS = $(LIBUUID) $(LIBUNICODE)
EXTRALIBS = -luuid $(LIBUNICODE)
C_SRCS = \
assoc.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = urlmon.dll
IMPORTS = cabinet ole32 wininet user32 kernel32 ntdll
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
umon.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = wined3d.dll
IMPORTS = user32 gdi32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = $(LIBUUID) @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
EXTRALIBS = -ldxguid -luuid @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@
C_SRCS = \
vertexshader.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winealsa.drv
IMPORTS = winmm user32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) @ALSALIBS@
EXTRALIBS = -ldxguid -luuid @ALSALIBS@
C_SRCS = \
audio.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winearts.drv
IMPORTS = winmm user32 kernel32
EXTRAINCL = @ARTSINCL@
EXTRALIBS = @ARTSLIBS@ $(LIBUUID)
EXTRALIBS = @ARTSLIBS@ -luuid
C_SRCS = \
arts.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wineaudioio.drv
IMPORTS = winmm user32 kernel32 ntdll
EXTRALIBS = $(LIBUUID) @AUDIOIOLIBS@
EXTRALIBS = -luuid @AUDIOIOLIBS@
C_SRCS = \
audio.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = winejack.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
audio.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winenas.drv
IMPORTS = winmm user32 kernel32
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @NASLIBS@ $(LIBUUID)
EXTRALIBS = -luuid @NASLIBS@
C_SRCS = \
audio.c \
......
......@@ -4,7 +4,7 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = wineoss.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -ldxguid -luuid
C_SRCS = \
audio.c \
......
......@@ -6,7 +6,7 @@ VPATH = @srcdir@
MODULE = winefile.exe
APPMODE = gui
IMPORTS = shell32 comctl32 ole32 user32 gdi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
license.c \
......
......@@ -5,7 +5,7 @@ VPATH = @srcdir@
MODULE = winemenubuilder.exe
APPMODE = gui
IMPORTS = shell32 ole32 user32 advapi32 kernel32
EXTRALIBS = $(LIBUUID)
EXTRALIBS = -luuid
C_SRCS = \
winemenubuilder.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment