Alexandre Julliard : makefiles: Don't allow extra libraries in tests.
Alexandre Julliard
julliard at winehq.org
Wed Jul 10 13:54:49 CDT 2013
Module: wine
Branch: master
Commit: 788cd8090c75085b31b56f4811a9d4747dac6c08
URL: http://source.winehq.org/git/wine.git/?a=commit;h=788cd8090c75085b31b56f4811a9d4747dac6c08
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Jul 10 16:49:38 2013 +0200
makefiles: Don't allow extra libraries in tests.
---
Maketest.rules.in | 3 +--
dlls/sti/tests/Makefile.in | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/Maketest.rules.in b/Maketest.rules.in
index 4ee50a0..7c13aaa 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -3,7 +3,6 @@
# Each individual makefile should define the following variables:
# TESTDLL : the dll to test
# C_SRCS : list of C test programs
-# EXTRALIBS : extra libraries to link in (optional)
# EXTRADEFS : extra symbol definitions, like -DWINELIB (optional)
#
# plus all variables required by the global Make.rules.in
@@ -19,7 +18,7 @@ WINETEST_EXE = $(TESTDLL:%.dll=%)_test-stripped.exe$(DLLEXT)
WINETEST_RES = $(top_builddir)/programs/winetest/$(TESTDLL:%.dll=%)_test.res
RUNTESTFLAGS = -q -P wine -M $(TESTDLL) -T $(top_builddir) -p $(TESTPROGRAM)
-ALL_LIBS = $(IMPORTS:%=-l%) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
+ALL_LIBS = $(IMPORTS:%=-l%) $(LDFLAGS) $(LIBS)
EXTRA_OBJS = testlist.o
CROSSTEST = $(TESTDLL:%.dll=%)_crosstest.exe
diff --git a/dlls/sti/tests/Makefile.in b/dlls/sti/tests/Makefile.in
index 8216d07..e463e5c 100644
--- a/dlls/sti/tests/Makefile.in
+++ b/dlls/sti/tests/Makefile.in
@@ -1,7 +1,6 @@
EXTRADEFS = -DCOM_NO_WINDOWS_H
TESTDLL = sti.dll
-IMPORTS = ole32
-EXTRALIBS = -luuid
+IMPORTS = uuid ole32
C_SRCS = \
sti.c
More information about the wine-cvs
mailing list