Francois Gouget : testbot/testagentd: Avoid wildcards when cleaning up object files.

Alexandre Julliard julliard at winehq.org
Wed Feb 2 16:36:10 CST 2022


Module: tools
Branch: master
Commit: 9fa7158c1747ff7dcd1b10e2e5533b3b1d5e11fe
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=9fa7158c1747ff7dcd1b10e2e5533b3b1d5e11fe

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Feb  2 15:08:33 2022 +0100

testbot/testagentd: Avoid wildcards when cleaning up object files.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 testbot/src/testagentd/Makefile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile
index b2f9e82..7808af2 100644
--- a/testbot/src/testagentd/Makefile
+++ b/testbot/src/testagentd/Makefile
@@ -8,16 +8,20 @@ build: $(builddir)/testagentd
 windows: TestAgentd.exe
 
 
-$(builddir)/testagentd: testagentd.o platform_unix.o
-	$(CC) -o $@ testagentd.o platform_unix.o
+UNIX_SOURCES      = testagentd.c platform_unix.c
+
+$(builddir)/testagentd: $(UNIX_SOURCES:.c=.o)
+	$(CC) -o $@ $(UNIX_SOURCES:.c=.o)
 	strip $@
 
 .c.o:
 	$(CC) -Wall -g -c -o $@ $<
 
 
-TestAgentd.exe: testagentd.obj platform_windows.obj
-	$(CROSSCC32) -o $@ testagentd.obj platform_windows.obj -lws2_32
+WIN_SOURCES      = testagentd.c platform_windows.c
+
+TestAgentd.exe: $(WIN_SOURCES:.c=.obj)
+	$(CROSSCC32) -o $@ $(WIN_SOURCES:.c=.obj) -lws2_32
 	$(CROSSSTRIP32) $@
 
 .SUFFIXES: .obj
@@ -28,6 +32,7 @@ testagentd.o testagentd.obj: platform.h
 platform_unix.o: platform.h list.h
 platform_windows.obj: platform.h list.h
 
+
 iso: winetestbot.iso
 
 winetestbot.iso: TestAgentd.exe
@@ -41,6 +46,7 @@ winetestbot.iso: TestAgentd.exe
 
 
 clean:
-	rm -f *.obj *.o
+	rm -f $(UNIX_SOURCES:.c=.o)
+	rm -f $(WIN_SOURCES:.c=.obj)
 	rm -f TestAgentd.exe
 	rm -f winetestbot.iso




More information about the wine-cvs mailing list