make : fix llava obj file race (#8946)

ggml-ci

diff --git a/Makefile b/Makefile
index 9584a44ad13e4407a406ec14226a98c0e5adb4f9..649671ed6a72e2674357255ccc8bff8a378fe610 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1454,26 +1454,20 @@ libllava.a: examples/llava/llava.cpp \
        $(CXX) $(CXXFLAGS) -static -fPIC -c $< -o $@ -Wno-cast-qual
 
 llama-llava-cli: examples/llava/llava-cli.cpp \
-       examples/llava/clip.h \
-       examples/llava/clip.cpp \
-       examples/llava/llava.h \
        examples/llava/llava.cpp \
+       examples/llava/llava.h \
+       examples/llava/clip.cpp \
+       examples/llava/clip.h \
        $(OBJ_ALL)
-       $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
-       $(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp  -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
-       $(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
-       $(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS)
+       $(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
 
 llama-minicpmv-cli: examples/llava/minicpmv-cli.cpp \
-       examples/llava/clip.h \
-       examples/llava/clip.cpp \
-       examples/llava/llava.h \
        examples/llava/llava.cpp \
+       examples/llava/llava.h \
+       examples/llava/clip.cpp \
+       examples/llava/clip.h \
        $(OBJ_ALL)
-       $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<)
-       $(CXX) $(CXXFLAGS) -c examples/llava/clip.cpp  -o $(call GET_OBJ_FILE, examples/llava/clip.cpp) -Wno-cast-qual
-       $(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp)
-       $(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS)
+       $(CXX) $(CXXFLAGS) $< $(filter-out %.h $<,$^) -o $@ $(LDFLAGS) -Wno-cast-qual
 
 ifeq ($(UNAME_S),Darwin)
 swift: examples/batched.swift